From 430af0bd22df46f49d68d92c5bf40351a5801bb8 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Fri, 12 Jul 2013 10:53:43 -0500 Subject: [PATCH] sfdisk is now used by default Signed-off-by: Robert Nelson --- hwpack/am335x-bone-serial.conf | 1 - hwpack/am335x-bone-video.conf | 1 - hwpack/am335x-boneblack.conf | 1 - hwpack/imx51-babbage.conf | 1 - hwpack/imx53-qsb.conf | 1 - hwpack/imx6dl-wandboard.conf | 1 - hwpack/imx6q-sabrelite.conf | 2 -- hwpack/imx6q-sabresd.conf | 1 - hwpack/imx6q-wandboard.conf | 1 - hwpack/omap3-beagle-xm-v3.9-dt.conf | 1 - hwpack/omap3-beagle-xm.conf | 1 - hwpack/omap4-panda-a4.conf | 1 - hwpack/omap4-panda-es.conf | 1 - hwpack/omap4-panda-v3.10-dt.conf | 1 - hwpack/omap4-panda.conf | 1 - hwpack/wandboard-dl.conf | 1 - hwpack/wandboard-quad.conf | 1 - hwpack/wandboard-solo.conf | 1 - mk_mmc.sh | 22 +++++----------------- 19 files changed, 5 insertions(+), 36 deletions(-) diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf index 71478e9..b861932 100644 --- a/hwpack/am335x-bone-serial.conf +++ b/hwpack/am335x-bone-serial.conf @@ -13,7 +13,6 @@ conf_boot_startmb="1" conf_boot_endmb="96" bootloader_location="fatfs_boot" -use_sfdisk=1 spl_name="MLO" boot_name="u-boot.img" diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf index 39208cb..02b9b23 100644 --- a/hwpack/am335x-bone-video.conf +++ b/hwpack/am335x-bone-video.conf @@ -13,7 +13,6 @@ conf_boot_startmb="1" conf_boot_endmb="96" bootloader_location="fatfs_boot" -use_sfdisk=1 spl_name="MLO" boot_name="u-boot.img" diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf index 7c23485..4464ba1 100644 --- a/hwpack/am335x-boneblack.conf +++ b/hwpack/am335x-boneblack.conf @@ -13,7 +13,6 @@ conf_boot_startmb="1" conf_boot_endmb="96" bootloader_location="fatfs_boot" -use_sfdisk=1 spl_name="MLO" boot_name="u-boot.img" diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf index e73ce03..9922b2b 100644 --- a/hwpack/imx51-babbage.conf +++ b/hwpack/imx51-babbage.conf @@ -17,7 +17,6 @@ conf_boot_endmb="96" bootloader_location="dd_uboot_boot" dd_uboot_bs="512" dd_uboot_seek="2" -use_sfdisk=1 unset spl_name boot_name="u-boot.imx" diff --git a/hwpack/imx53-qsb.conf b/hwpack/imx53-qsb.conf index ada1617..ab28db1 100644 --- a/hwpack/imx53-qsb.conf +++ b/hwpack/imx53-qsb.conf @@ -17,7 +17,6 @@ conf_boot_endmb="96" bootloader_location="dd_uboot_boot" dd_uboot_bs="512" dd_uboot_seek="2" -use_sfdisk=1 unset spl_name boot_name="u-boot.imx" diff --git a/hwpack/imx6dl-wandboard.conf b/hwpack/imx6dl-wandboard.conf index 0c8fb7b..5639d10 100644 --- a/hwpack/imx6dl-wandboard.conf +++ b/hwpack/imx6dl-wandboard.conf @@ -17,7 +17,6 @@ conf_boot_endmb="96" bootloader_location="dd_uboot_boot" dd_uboot_bs="512" dd_uboot_seek="2" -use_sfdisk=1 unset spl_name boot_name="u-boot.imx" diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf index e90d0dc..0f31e51 100644 --- a/hwpack/imx6q-sabrelite.conf +++ b/hwpack/imx6q-sabrelite.conf @@ -13,8 +13,6 @@ conf_boot_fstype="ext2" conf_boot_startmb="1" conf_boot_endmb="96" -use_sfdisk=1 - #Bootloader: u-boot features: #CONFIG_CMD_BOOTZ diff --git a/hwpack/imx6q-sabresd.conf b/hwpack/imx6q-sabresd.conf index 4baecd8..83d4442 100644 --- a/hwpack/imx6q-sabresd.conf +++ b/hwpack/imx6q-sabresd.conf @@ -15,7 +15,6 @@ conf_boot_endmb="96" bootloader_location="dd_uboot_boot" dd_uboot_bs="512" dd_uboot_seek="2" -use_sfdisk=1 unset spl_name boot_name="u-boot.imx" diff --git a/hwpack/imx6q-wandboard.conf b/hwpack/imx6q-wandboard.conf index 54c9b6d..43f9d33 100644 --- a/hwpack/imx6q-wandboard.conf +++ b/hwpack/imx6q-wandboard.conf @@ -17,7 +17,6 @@ conf_boot_endmb="96" bootloader_location="dd_uboot_boot" dd_uboot_bs="512" dd_uboot_seek="2" -use_sfdisk=1 unset spl_name boot_name="u-boot.imx" diff --git a/hwpack/omap3-beagle-xm-v3.9-dt.conf b/hwpack/omap3-beagle-xm-v3.9-dt.conf index f17063f..2e01bc2 100644 --- a/hwpack/omap3-beagle-xm-v3.9-dt.conf +++ b/hwpack/omap3-beagle-xm-v3.9-dt.conf @@ -13,7 +13,6 @@ conf_boot_startmb="1" conf_boot_endmb="96" bootloader_location="fatfs_boot" -use_sfdisk=1 spl_name="MLO" boot_name="u-boot.img" diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf index d9c2fef..091dee8 100644 --- a/hwpack/omap3-beagle-xm.conf +++ b/hwpack/omap3-beagle-xm.conf @@ -13,7 +13,6 @@ conf_boot_startmb="1" conf_boot_endmb="96" bootloader_location="fatfs_boot" -use_sfdisk=1 spl_name="MLO" boot_name="u-boot.img" diff --git a/hwpack/omap4-panda-a4.conf b/hwpack/omap4-panda-a4.conf index d2cbdb2..991269e 100644 --- a/hwpack/omap4-panda-a4.conf +++ b/hwpack/omap4-panda-a4.conf @@ -13,7 +13,6 @@ conf_boot_startmb="1" conf_boot_endmb="96" bootloader_location="fatfs_boot" -use_sfdisk=1 spl_name="MLO" boot_name="u-boot.img" diff --git a/hwpack/omap4-panda-es.conf b/hwpack/omap4-panda-es.conf index 73437e3..0d3a88e 100644 --- a/hwpack/omap4-panda-es.conf +++ b/hwpack/omap4-panda-es.conf @@ -13,7 +13,6 @@ conf_boot_startmb="1" conf_boot_endmb="96" bootloader_location="fatfs_boot" -use_sfdisk=1 spl_name="MLO" boot_name="u-boot.img" diff --git a/hwpack/omap4-panda-v3.10-dt.conf b/hwpack/omap4-panda-v3.10-dt.conf index 90b9af6..be32930 100644 --- a/hwpack/omap4-panda-v3.10-dt.conf +++ b/hwpack/omap4-panda-v3.10-dt.conf @@ -13,7 +13,6 @@ conf_boot_startmb="1" conf_boot_endmb="96" bootloader_location="fatfs_boot" -use_sfdisk=1 spl_name="MLO" boot_name="u-boot.img" diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf index 7a82b13..31ee43b 100644 --- a/hwpack/omap4-panda.conf +++ b/hwpack/omap4-panda.conf @@ -13,7 +13,6 @@ conf_boot_startmb="1" conf_boot_endmb="96" bootloader_location="fatfs_boot" -use_sfdisk=1 spl_name="MLO" boot_name="u-boot.img" diff --git a/hwpack/wandboard-dl.conf b/hwpack/wandboard-dl.conf index bec6169..1cc06e4 100644 --- a/hwpack/wandboard-dl.conf +++ b/hwpack/wandboard-dl.conf @@ -17,7 +17,6 @@ conf_boot_endmb="96" bootloader_location="dd_uboot_boot" dd_uboot_bs="512" dd_uboot_seek="2" -use_sfdisk=1 unset spl_name boot_name="u-boot.imx" diff --git a/hwpack/wandboard-quad.conf b/hwpack/wandboard-quad.conf index 7448fc1..24b6c3f 100644 --- a/hwpack/wandboard-quad.conf +++ b/hwpack/wandboard-quad.conf @@ -17,7 +17,6 @@ conf_boot_endmb="96" bootloader_location="dd_uboot_boot" dd_uboot_bs="512" dd_uboot_seek="2" -use_sfdisk=1 unset spl_name boot_name="u-boot.imx" diff --git a/hwpack/wandboard-solo.conf b/hwpack/wandboard-solo.conf index b498ef9..b14f36e 100644 --- a/hwpack/wandboard-solo.conf +++ b/hwpack/wandboard-solo.conf @@ -17,7 +17,6 @@ conf_boot_endmb="96" bootloader_location="dd_uboot_boot" dd_uboot_bs="512" dd_uboot_seek="2" -use_sfdisk=1 unset spl_name boot_name="u-boot.imx" diff --git a/mk_mmc.sh b/mk_mmc.sh index 56182c2..ac3ab82 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -1217,26 +1217,18 @@ create_partitions () { case "${bootloader_location}" in fatfs_boot) - if [ "${use_sfdisk}" ] ; then - sfdisk_boot_partition - else - fdisk_boot_partition - fi + sfdisk_boot_partition ;; dd_uboot_boot) dd_uboot_boot - if [ "${use_sfdisk}" ] ; then - sfdisk_boot_partition - else - LC_ALL=C parted --script ${MMC} mkpart primary ${parted_format} ${conf_boot_startmb} ${conf_boot_endmb} - fi + sfdisk_boot_partition ;; dd_spl_uboot_boot) dd_spl_uboot_boot LC_ALL=C parted --script ${MMC} mkpart primary ${parted_format} ${conf_boot_startmb} ${conf_boot_endmb} ;; *) - fdisk_boot_partition + sfdisk_boot_partition ;; esac format_boot_partition @@ -1613,8 +1605,6 @@ is_omap () { conf_zreladdr="0x80008000" conf_fdtaddr="0x815f0000" - conf_boot_fstype="fat" - SERIAL="ttyO2" SERIAL_CONSOLE="${SERIAL},115200n8" @@ -1682,6 +1672,7 @@ check_uboot_type () { ;; bone-serial|bone) #Bootloader Partition: + conf_boot_fstype="fat" conf_boot_startmb="1" conf_boot_endmb="96" @@ -1710,6 +1701,7 @@ check_uboot_type () { ;; bone-video) #Bootloader Partition: + conf_boot_fstype="fat" conf_boot_startmb="1" conf_boot_endmb="96" @@ -1896,7 +1888,6 @@ checkparm () { } error_invalid_uboot_dtb=1 -unset use_sfdisk # parse commandline options while [ ! -z "$1" ] ; do @@ -1984,9 +1975,6 @@ while [ ! -z "$1" ] ; do --use-beta-bootloader) USE_BETA_BOOTLOADER=1 ;; - --use-sfdisk) - use_sfdisk=1 - ;; esac shift done