sfdisk: always specify the partition starting mb conf_boot_startmb

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/22/head
Robert Nelson 12 years ago
parent 3266bc4036
commit e393e02854

@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest"
conf_bl_listfile="bootloader-ng" conf_bl_listfile="bootloader-ng"
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="fatfs_boot" bootloader_location="fatfs_boot"
boot_fstype="fat" boot_fstype="fat"
boot_partition_size="96" boot_partition_size="96"

@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest"
conf_bl_listfile="bootloader-ng" conf_bl_listfile="bootloader-ng"
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="fatfs_boot" bootloader_location="fatfs_boot"
boot_fstype="fat" boot_fstype="fat"
boot_partition_size="96" boot_partition_size="96"

@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest"
conf_bl_listfile="bootloader-ng" conf_bl_listfile="bootloader-ng"
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="fatfs_boot" bootloader_location="fatfs_boot"
boot_fstype="fat" boot_fstype="fat"
boot_partition_size="96" boot_partition_size="96"

@ -22,6 +22,8 @@ conf_bl_listfile="bootloader-ng"
[omap and a mainline u-boot] [omap and a mainline u-boot]
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="fatfs_boot" bootloader_location="fatfs_boot"
boot_fstype="fat" boot_fstype="fat"
boot_partition_size="100" boot_partition_size="100"
@ -53,6 +55,8 @@ uboot_fdt_auto_detection=1
[imx and a mainline u-boot] [imx and a mainline u-boot]
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="dd_uboot_boot" bootloader_location="dd_uboot_boot"
boot_fstype="ext2" boot_fstype="ext2"
dd_uboot_seek="1" dd_uboot_seek="1"

@ -10,6 +10,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
conf_bl_listfile="bootloader-ng" conf_bl_listfile="bootloader-ng"
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="dd_uboot_boot" bootloader_location="dd_uboot_boot"
boot_fstype="ext2" boot_fstype="ext2"
dd_uboot_bs="512" dd_uboot_bs="512"

@ -10,6 +10,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
conf_bl_listfile="bootloader-ng" conf_bl_listfile="bootloader-ng"
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="dd_uboot_boot" bootloader_location="dd_uboot_boot"
boot_fstype="ext2" boot_fstype="ext2"
dd_uboot_bs="512" dd_uboot_bs="512"

@ -10,6 +10,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
conf_bl_listfile="bootloader-ng" conf_bl_listfile="bootloader-ng"
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="dd_uboot_boot" bootloader_location="dd_uboot_boot"
boot_fstype="ext2" boot_fstype="ext2"
dd_uboot_bs="512" dd_uboot_bs="512"

@ -7,6 +7,10 @@ SYSTEM="mx6qsabrelite"
#Bootloader: #Bootloader:
conf_board="MX6QSABRELITE_D" conf_board="MX6QSABRELITE_D"
conf_bootloader_in_flash="1" conf_bootloader_in_flash="1"
#Bootloader Partition:
conf_boot_startmb="1"
boot_fstype="ext2" boot_fstype="ext2"
boot_partition_size="96" boot_partition_size="96"
boot_startmb="1" boot_startmb="1"

@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
conf_bl_listfile="bootloader-ng" conf_bl_listfile="bootloader-ng"
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="dd_uboot_boot" bootloader_location="dd_uboot_boot"
boot_fstype="ext2" boot_fstype="ext2"
dd_uboot_bs="512" dd_uboot_bs="512"

@ -10,6 +10,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
conf_bl_listfile="bootloader-ng" conf_bl_listfile="bootloader-ng"
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="dd_uboot_boot" bootloader_location="dd_uboot_boot"
boot_fstype="ext2" boot_fstype="ext2"
dd_uboot_bs="512" dd_uboot_bs="512"

@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest"
conf_bl_listfile="bootloader-ng" conf_bl_listfile="bootloader-ng"
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="fatfs_boot" bootloader_location="fatfs_boot"
boot_fstype="fat" boot_fstype="fat"
boot_partition_size="96" boot_partition_size="96"

@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest"
conf_bl_listfile="bootloader-ng" conf_bl_listfile="bootloader-ng"
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="fatfs_boot" bootloader_location="fatfs_boot"
boot_fstype="fat" boot_fstype="fat"
boot_partition_size="96" boot_partition_size="96"

@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest"
conf_bl_listfile="bootloader-ng" conf_bl_listfile="bootloader-ng"
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="fatfs_boot" bootloader_location="fatfs_boot"
boot_fstype="fat" boot_fstype="fat"
boot_partition_size="96" boot_partition_size="96"

@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest"
conf_bl_listfile="bootloader-ng" conf_bl_listfile="bootloader-ng"
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="fatfs_boot" bootloader_location="fatfs_boot"
boot_fstype="fat" boot_fstype="fat"
boot_partition_size="96" boot_partition_size="96"

@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest"
conf_bl_listfile="bootloader-ng" conf_bl_listfile="bootloader-ng"
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="fatfs_boot" bootloader_location="fatfs_boot"
boot_fstype="fat" boot_fstype="fat"
boot_partition_size="96" boot_partition_size="96"

@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest"
conf_bl_listfile="bootloader-ng" conf_bl_listfile="bootloader-ng"
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="fatfs_boot" bootloader_location="fatfs_boot"
boot_fstype="fat" boot_fstype="fat"
boot_partition_size="96" boot_partition_size="96"

@ -10,6 +10,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
conf_bl_listfile="bootloader-ng" conf_bl_listfile="bootloader-ng"
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="dd_uboot_boot" bootloader_location="dd_uboot_boot"
boot_fstype="ext2" boot_fstype="ext2"
dd_uboot_bs="512" dd_uboot_bs="512"

@ -10,6 +10,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
conf_bl_listfile="bootloader-ng" conf_bl_listfile="bootloader-ng"
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="dd_uboot_boot" bootloader_location="dd_uboot_boot"
boot_fstype="ext2" boot_fstype="ext2"
dd_uboot_bs="512" dd_uboot_bs="512"

@ -10,6 +10,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest/"
conf_bl_listfile="bootloader-ng" conf_bl_listfile="bootloader-ng"
#Bootloader Partition: #Bootloader Partition:
conf_boot_startmb="1"
bootloader_location="dd_uboot_boot" bootloader_location="dd_uboot_boot"
boot_fstype="ext2" boot_fstype="ext2"
dd_uboot_bs="512" dd_uboot_bs="512"

@ -1164,7 +1164,7 @@ sfdisk_boot_partition () {
echo "-----------------------------" echo "-----------------------------"
LC_ALL=C sfdisk --in-order --Linux --unit M "${MMC}" <<-__EOF__ LC_ALL=C sfdisk --in-order --Linux --unit M "${MMC}" <<-__EOF__
1,${boot_partition_size},0xe,* ${conf_boot_startmb},${boot_partition_size},0xe,*
__EOF__ __EOF__
sync sync
@ -1227,15 +1227,15 @@ create_partitions () {
dd_uboot_boot dd_uboot_boot
if [ "${use_sfdisk}" ] ; then if [ "${use_sfdisk}" ] ; then
LC_ALL=C sfdisk --in-order --Linux --unit M "${MMC}" <<-__EOF__ LC_ALL=C sfdisk --in-order --Linux --unit M "${MMC}" <<-__EOF__
${boot_startmb},${boot_partition_size},0x83,* ${conf_boot_startmb},${boot_partition_size},0x83,*
__EOF__ __EOF__
else else
LC_ALL=C parted --script ${MMC} mkpart primary ${parted_format} ${boot_startmb} ${boot_partition_size} LC_ALL=C parted --script ${MMC} mkpart primary ${parted_format} ${conf_boot_startmb} ${boot_partition_size}
fi fi
;; ;;
dd_spl_uboot_boot) dd_spl_uboot_boot)
dd_spl_uboot_boot dd_spl_uboot_boot
LC_ALL=C parted --script ${MMC} mkpart primary ${parted_format} ${boot_startmb} ${boot_partition_size} LC_ALL=C parted --script ${MMC} mkpart primary ${parted_format} ${conf_boot_startmb} ${boot_partition_size}
;; ;;
*) *)
fdisk_boot_partition fdisk_boot_partition
@ -1514,6 +1514,11 @@ process_dtb_conf () {
show_board_warning show_board_warning
fi fi
if [ ! "${conf_boot_startmb}" ] ; then
echo "Warning: [conf_boot_startmb] was undefined setting as: 1"
conf_boot_startmb="1"
fi
if [ "${conf_uboot_CONFIG_CMD_BOOTZ}" ] ; then if [ "${conf_uboot_CONFIG_CMD_BOOTZ}" ] ; then
conf_bootcmd="bootz" conf_bootcmd="bootz"
conf_normal_kernel_file=zImage conf_normal_kernel_file=zImage
@ -1656,6 +1661,9 @@ check_uboot_type () {
convert_uboot_to_dtb_board convert_uboot_to_dtb_board
;; ;;
bone-serial|bone) bone-serial|bone)
#Bootloader Partition:
conf_boot_startmb="1"
need_am335x_firmware="1" need_am335x_firmware="1"
conf_entrypt="uenvcmd" conf_entrypt="uenvcmd"
SYSTEM="bone" SYSTEM="bone"
@ -1680,6 +1688,9 @@ check_uboot_type () {
convert_uboot_to_dtb_board convert_uboot_to_dtb_board
;; ;;
bone-video) bone-video)
#Bootloader Partition:
conf_boot_startmb="1"
need_am335x_firmware="1" need_am335x_firmware="1"
conf_entrypt="uenvcmd" conf_entrypt="uenvcmd"
SYSTEM="bone" SYSTEM="bone"

Loading…
Cancel
Save