From e393e02854df0fe9303177225b098b697761068c Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Fri, 12 Jul 2013 09:44:06 -0500 Subject: [PATCH] sfdisk: always specify the partition starting mb conf_boot_startmb Signed-off-by: Robert Nelson --- hwpack/am335x-bone-serial.conf | 2 ++ hwpack/am335x-bone-video.conf | 2 ++ hwpack/am335x-boneblack.conf | 2 ++ hwpack/docs.txt | 4 ++++ hwpack/imx51-babbage.conf | 2 ++ hwpack/imx53-qsb.conf | 2 ++ hwpack/imx6dl-wandboard.conf | 2 ++ hwpack/imx6q-sabrelite.conf | 4 ++++ hwpack/imx6q-sabresd.conf | 2 ++ hwpack/imx6q-wandboard.conf | 2 ++ hwpack/omap3-beagle-xm-v3.9-dt.conf | 2 ++ hwpack/omap3-beagle-xm.conf | 2 ++ hwpack/omap4-panda-a4.conf | 2 ++ hwpack/omap4-panda-es.conf | 2 ++ hwpack/omap4-panda-v3.10-dt.conf | 2 ++ hwpack/omap4-panda.conf | 2 ++ hwpack/wandboard-dl.conf | 2 ++ hwpack/wandboard-quad.conf | 2 ++ hwpack/wandboard-solo.conf | 2 ++ mk_mmc.sh | 19 +++++++++++++++---- 20 files changed, 57 insertions(+), 4 deletions(-) diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf index 2ce85be..9b74cac 100644 --- a/hwpack/am335x-bone-serial.conf +++ b/hwpack/am335x-bone-serial.conf @@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest" conf_bl_listfile="bootloader-ng" #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="fatfs_boot" boot_fstype="fat" boot_partition_size="96" diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf index dafea04..b7d64d4 100644 --- a/hwpack/am335x-bone-video.conf +++ b/hwpack/am335x-bone-video.conf @@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest" conf_bl_listfile="bootloader-ng" #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="fatfs_boot" boot_fstype="fat" boot_partition_size="96" diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf index 1b64640..75b001c 100644 --- a/hwpack/am335x-boneblack.conf +++ b/hwpack/am335x-boneblack.conf @@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest" conf_bl_listfile="bootloader-ng" #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="fatfs_boot" boot_fstype="fat" boot_partition_size="96" diff --git a/hwpack/docs.txt b/hwpack/docs.txt index 610bbf9..d05bdb4 100644 --- a/hwpack/docs.txt +++ b/hwpack/docs.txt @@ -22,6 +22,8 @@ conf_bl_listfile="bootloader-ng" [omap and a mainline u-boot] #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="fatfs_boot" boot_fstype="fat" boot_partition_size="100" @@ -53,6 +55,8 @@ uboot_fdt_auto_detection=1 [imx and a mainline u-boot] #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="dd_uboot_boot" boot_fstype="ext2" dd_uboot_seek="1" diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf index 0acdd00..d4bf6d0 100644 --- a/hwpack/imx51-babbage.conf +++ b/hwpack/imx51-babbage.conf @@ -10,6 +10,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest/" conf_bl_listfile="bootloader-ng" #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="dd_uboot_boot" boot_fstype="ext2" dd_uboot_bs="512" diff --git a/hwpack/imx53-qsb.conf b/hwpack/imx53-qsb.conf index 394bfff..d772916 100644 --- a/hwpack/imx53-qsb.conf +++ b/hwpack/imx53-qsb.conf @@ -10,6 +10,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest/" conf_bl_listfile="bootloader-ng" #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="dd_uboot_boot" boot_fstype="ext2" dd_uboot_bs="512" diff --git a/hwpack/imx6dl-wandboard.conf b/hwpack/imx6dl-wandboard.conf index 0fe9e63..e47d22d 100644 --- a/hwpack/imx6dl-wandboard.conf +++ b/hwpack/imx6dl-wandboard.conf @@ -10,6 +10,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest/" conf_bl_listfile="bootloader-ng" #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="dd_uboot_boot" boot_fstype="ext2" dd_uboot_bs="512" diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf index a63e548..5e7a400 100644 --- a/hwpack/imx6q-sabrelite.conf +++ b/hwpack/imx6q-sabrelite.conf @@ -7,6 +7,10 @@ SYSTEM="mx6qsabrelite" #Bootloader: conf_board="MX6QSABRELITE_D" conf_bootloader_in_flash="1" + +#Bootloader Partition: +conf_boot_startmb="1" + boot_fstype="ext2" boot_partition_size="96" boot_startmb="1" diff --git a/hwpack/imx6q-sabresd.conf b/hwpack/imx6q-sabresd.conf index 8229bfe..b0eacdc 100644 --- a/hwpack/imx6q-sabresd.conf +++ b/hwpack/imx6q-sabresd.conf @@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest/" conf_bl_listfile="bootloader-ng" #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="dd_uboot_boot" boot_fstype="ext2" dd_uboot_bs="512" diff --git a/hwpack/imx6q-wandboard.conf b/hwpack/imx6q-wandboard.conf index fa97301..354960d 100644 --- a/hwpack/imx6q-wandboard.conf +++ b/hwpack/imx6q-wandboard.conf @@ -10,6 +10,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest/" conf_bl_listfile="bootloader-ng" #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="dd_uboot_boot" boot_fstype="ext2" dd_uboot_bs="512" diff --git a/hwpack/omap3-beagle-xm-v3.9-dt.conf b/hwpack/omap3-beagle-xm-v3.9-dt.conf index f1a715a..cc9eb02 100644 --- a/hwpack/omap3-beagle-xm-v3.9-dt.conf +++ b/hwpack/omap3-beagle-xm-v3.9-dt.conf @@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest" conf_bl_listfile="bootloader-ng" #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="fatfs_boot" boot_fstype="fat" boot_partition_size="96" diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf index 3e3891d..6e6e3ba 100644 --- a/hwpack/omap3-beagle-xm.conf +++ b/hwpack/omap3-beagle-xm.conf @@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest" conf_bl_listfile="bootloader-ng" #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="fatfs_boot" boot_fstype="fat" boot_partition_size="96" diff --git a/hwpack/omap4-panda-a4.conf b/hwpack/omap4-panda-a4.conf index e3a8930..1cd1de0 100644 --- a/hwpack/omap4-panda-a4.conf +++ b/hwpack/omap4-panda-a4.conf @@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest" conf_bl_listfile="bootloader-ng" #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="fatfs_boot" boot_fstype="fat" boot_partition_size="96" diff --git a/hwpack/omap4-panda-es.conf b/hwpack/omap4-panda-es.conf index 947bef7..f6ba8c2 100644 --- a/hwpack/omap4-panda-es.conf +++ b/hwpack/omap4-panda-es.conf @@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest" conf_bl_listfile="bootloader-ng" #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="fatfs_boot" boot_fstype="fat" boot_partition_size="96" diff --git a/hwpack/omap4-panda-v3.10-dt.conf b/hwpack/omap4-panda-v3.10-dt.conf index ab470a2..3274f80 100644 --- a/hwpack/omap4-panda-v3.10-dt.conf +++ b/hwpack/omap4-panda-v3.10-dt.conf @@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest" conf_bl_listfile="bootloader-ng" #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="fatfs_boot" boot_fstype="fat" boot_partition_size="96" diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf index 6ea4cd0..0589c07 100644 --- a/hwpack/omap4-panda.conf +++ b/hwpack/omap4-panda.conf @@ -8,6 +8,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest" conf_bl_listfile="bootloader-ng" #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="fatfs_boot" boot_fstype="fat" boot_partition_size="96" diff --git a/hwpack/wandboard-dl.conf b/hwpack/wandboard-dl.conf index faddc6e..e77d284 100644 --- a/hwpack/wandboard-dl.conf +++ b/hwpack/wandboard-dl.conf @@ -10,6 +10,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest/" conf_bl_listfile="bootloader-ng" #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="dd_uboot_boot" boot_fstype="ext2" dd_uboot_bs="512" diff --git a/hwpack/wandboard-quad.conf b/hwpack/wandboard-quad.conf index 00078ed..49ca50a 100644 --- a/hwpack/wandboard-quad.conf +++ b/hwpack/wandboard-quad.conf @@ -10,6 +10,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest/" conf_bl_listfile="bootloader-ng" #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="dd_uboot_boot" boot_fstype="ext2" dd_uboot_bs="512" diff --git a/hwpack/wandboard-solo.conf b/hwpack/wandboard-solo.conf index 1eea45c..4be7899 100644 --- a/hwpack/wandboard-solo.conf +++ b/hwpack/wandboard-solo.conf @@ -10,6 +10,8 @@ conf_bl_http="http://rcn-ee.net/deb/tools/latest/" conf_bl_listfile="bootloader-ng" #Bootloader Partition: +conf_boot_startmb="1" + bootloader_location="dd_uboot_boot" boot_fstype="ext2" dd_uboot_bs="512" diff --git a/mk_mmc.sh b/mk_mmc.sh index dd5dd7a..a4b9130 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -1164,7 +1164,7 @@ sfdisk_boot_partition () { echo "-----------------------------" LC_ALL=C sfdisk --in-order --Linux --unit M "${MMC}" <<-__EOF__ - 1,${boot_partition_size},0xe,* + ${conf_boot_startmb},${boot_partition_size},0xe,* __EOF__ sync @@ -1227,15 +1227,15 @@ create_partitions () { dd_uboot_boot if [ "${use_sfdisk}" ] ; then 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__ 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 ;; 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 @@ -1514,6 +1514,11 @@ process_dtb_conf () { show_board_warning 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 conf_bootcmd="bootz" conf_normal_kernel_file=zImage @@ -1656,6 +1661,9 @@ check_uboot_type () { convert_uboot_to_dtb_board ;; bone-serial|bone) + #Bootloader Partition: + conf_boot_startmb="1" + need_am335x_firmware="1" conf_entrypt="uenvcmd" SYSTEM="bone" @@ -1680,6 +1688,9 @@ check_uboot_type () { convert_uboot_to_dtb_board ;; bone-video) + #Bootloader Partition: + conf_boot_startmb="1" + need_am335x_firmware="1" conf_entrypt="uenvcmd" SYSTEM="bone"