From c88740ecbc3003f49ff1e8da9e821aec455f0c19 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Tue, 13 Aug 2013 10:43:49 -0500 Subject: [PATCH] conf: this partition size is used by default Signed-off-by: Robert Nelson --- hwpack/am335x-bone-serial.conf | 2 -- hwpack/am335x-bone-video.conf | 2 -- hwpack/am335x-boneblack.conf | 2 -- hwpack/example.conf | 13 +++++++++++++ hwpack/imx51-babbage.conf | 2 -- hwpack/imx53-qsb.conf | 2 -- hwpack/imx6dl-wandboard.conf | 2 -- hwpack/imx6q-sabrelite.conf | 2 -- hwpack/imx6q-sabresd.conf | 2 -- hwpack/imx6q-wandboard.conf | 2 -- hwpack/omap3-beagle-dt.conf | 2 -- hwpack/omap3-beagle-xm-dt.conf | 2 -- hwpack/omap3-beagle-xm.conf | 2 -- hwpack/omap3-beagle.conf | 2 -- hwpack/omap4-panda-a4.conf | 2 -- hwpack/omap4-panda-dt.conf | 2 -- hwpack/omap4-panda-es.conf | 2 -- hwpack/omap4-panda.conf | 2 -- hwpack/wandboard-solo.conf | 2 -- mk_mmc.sh | 25 +++++++++++++++---------- 20 files changed, 28 insertions(+), 46 deletions(-) create mode 100644 hwpack/example.conf diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf index 9e1bcbd..ecabf1d 100644 --- a/hwpack/am335x-bone-serial.conf +++ b/hwpack/am335x-bone-serial.conf @@ -8,8 +8,6 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: conf_boot_fstype="fat" -conf_boot_startmb="1" -conf_boot_endmb="96" bootloader_location="fatfs_boot" spl_name="MLO" diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf index 2b091a2..72cb9cf 100644 --- a/hwpack/am335x-bone-video.conf +++ b/hwpack/am335x-bone-video.conf @@ -8,8 +8,6 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: conf_boot_fstype="fat" -conf_boot_startmb="1" -conf_boot_endmb="96" bootloader_location="fatfs_boot" spl_name="MLO" diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf index 388e0a6..42ac1ba 100644 --- a/hwpack/am335x-boneblack.conf +++ b/hwpack/am335x-boneblack.conf @@ -8,8 +8,6 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: conf_boot_fstype="fat" -conf_boot_startmb="1" -conf_boot_endmb="96" bootloader_location="fatfs_boot" spl_name="MLO" diff --git a/hwpack/example.conf b/hwpack/example.conf new file mode 100644 index 0000000..a46d8cf --- /dev/null +++ b/hwpack/example.conf @@ -0,0 +1,13 @@ +#!/bin/bash +# --dtb example + +#Bootloader Partition: +#conf_boot_fstype="fat" +#conf_boot_fstype="ext2" +#conf_boot_fstype="ext3" +#conf_boot_fstype="ext4" +#conf_boot_fstype="btrfs" + +#Bootloader Partition size: (default values): +#conf_boot_startmb="1" +#conf_boot_endmb="96" diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf index 074b189..8d6fa69 100644 --- a/hwpack/imx51-babbage.conf +++ b/hwpack/imx51-babbage.conf @@ -8,8 +8,6 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: conf_boot_fstype="ext2" -conf_boot_startmb="1" -conf_boot_endmb="96" bootloader_location="dd_uboot_boot" dd_uboot_bs="512" diff --git a/hwpack/imx53-qsb.conf b/hwpack/imx53-qsb.conf index 8cb16ff..70cf54e 100644 --- a/hwpack/imx53-qsb.conf +++ b/hwpack/imx53-qsb.conf @@ -8,8 +8,6 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: conf_boot_fstype="ext2" -conf_boot_startmb="1" -conf_boot_endmb="96" bootloader_location="dd_uboot_boot" dd_uboot_bs="512" diff --git a/hwpack/imx6dl-wandboard.conf b/hwpack/imx6dl-wandboard.conf index 2faa533..61c9d8c 100644 --- a/hwpack/imx6dl-wandboard.conf +++ b/hwpack/imx6dl-wandboard.conf @@ -8,8 +8,6 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: conf_boot_fstype="ext2" -conf_boot_startmb="1" -conf_boot_endmb="96" bootloader_location="dd_uboot_boot" dd_uboot_bs="512" diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf index 0f31e51..41c87a5 100644 --- a/hwpack/imx6q-sabrelite.conf +++ b/hwpack/imx6q-sabrelite.conf @@ -10,8 +10,6 @@ conf_bootloader_in_flash="1" #Bootloader Partition: conf_boot_fstype="ext2" -conf_boot_startmb="1" -conf_boot_endmb="96" #Bootloader: u-boot features: diff --git a/hwpack/imx6q-sabresd.conf b/hwpack/imx6q-sabresd.conf index c98d588..cb22553 100644 --- a/hwpack/imx6q-sabresd.conf +++ b/hwpack/imx6q-sabresd.conf @@ -8,8 +8,6 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: conf_boot_fstype="ext2" -conf_boot_startmb="1" -conf_boot_endmb="96" bootloader_location="dd_uboot_boot" dd_uboot_bs="512" diff --git a/hwpack/imx6q-wandboard.conf b/hwpack/imx6q-wandboard.conf index 487b378..ddcbf38 100644 --- a/hwpack/imx6q-wandboard.conf +++ b/hwpack/imx6q-wandboard.conf @@ -8,8 +8,6 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: conf_boot_fstype="ext2" -conf_boot_startmb="1" -conf_boot_endmb="96" bootloader_location="dd_uboot_boot" dd_uboot_bs="512" diff --git a/hwpack/omap3-beagle-dt.conf b/hwpack/omap3-beagle-dt.conf index 842ecc3..dfe4d99 100644 --- a/hwpack/omap3-beagle-dt.conf +++ b/hwpack/omap3-beagle-dt.conf @@ -8,8 +8,6 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: conf_boot_fstype="fat" -conf_boot_startmb="1" -conf_boot_endmb="96" bootloader_location="fatfs_boot" spl_name="MLO" diff --git a/hwpack/omap3-beagle-xm-dt.conf b/hwpack/omap3-beagle-xm-dt.conf index 288c228..8055d1f 100644 --- a/hwpack/omap3-beagle-xm-dt.conf +++ b/hwpack/omap3-beagle-xm-dt.conf @@ -8,8 +8,6 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: conf_boot_fstype="fat" -conf_boot_startmb="1" -conf_boot_endmb="96" bootloader_location="fatfs_boot" spl_name="MLO" diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf index 2eb91b2..452bbc4 100644 --- a/hwpack/omap3-beagle-xm.conf +++ b/hwpack/omap3-beagle-xm.conf @@ -8,8 +8,6 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: conf_boot_fstype="fat" -conf_boot_startmb="1" -conf_boot_endmb="96" bootloader_location="fatfs_boot" spl_name="MLO" diff --git a/hwpack/omap3-beagle.conf b/hwpack/omap3-beagle.conf index fd63977..1bfe332 100644 --- a/hwpack/omap3-beagle.conf +++ b/hwpack/omap3-beagle.conf @@ -8,8 +8,6 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: conf_boot_fstype="fat" -conf_boot_startmb="1" -conf_boot_endmb="96" bootloader_location="fatfs_boot" spl_name="MLO" diff --git a/hwpack/omap4-panda-a4.conf b/hwpack/omap4-panda-a4.conf index dc8365a..7a5aa75 100644 --- a/hwpack/omap4-panda-a4.conf +++ b/hwpack/omap4-panda-a4.conf @@ -8,8 +8,6 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: conf_boot_fstype="fat" -conf_boot_startmb="1" -conf_boot_endmb="96" bootloader_location="fatfs_boot" spl_name="MLO" diff --git a/hwpack/omap4-panda-dt.conf b/hwpack/omap4-panda-dt.conf index 60dabbc..d4b7236 100644 --- a/hwpack/omap4-panda-dt.conf +++ b/hwpack/omap4-panda-dt.conf @@ -8,8 +8,6 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: conf_boot_fstype="fat" -conf_boot_startmb="1" -conf_boot_endmb="96" bootloader_location="fatfs_boot" spl_name="MLO" diff --git a/hwpack/omap4-panda-es.conf b/hwpack/omap4-panda-es.conf index 1d71206..432bb4c 100644 --- a/hwpack/omap4-panda-es.conf +++ b/hwpack/omap4-panda-es.conf @@ -8,8 +8,6 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: conf_boot_fstype="fat" -conf_boot_startmb="1" -conf_boot_endmb="96" bootloader_location="fatfs_boot" spl_name="MLO" diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf index 2f21568..2e96409 100644 --- a/hwpack/omap4-panda.conf +++ b/hwpack/omap4-panda.conf @@ -8,8 +8,6 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: conf_boot_fstype="fat" -conf_boot_startmb="1" -conf_boot_endmb="96" bootloader_location="fatfs_boot" spl_name="MLO" diff --git a/hwpack/wandboard-solo.conf b/hwpack/wandboard-solo.conf index 4bd24d1..2b5a989 100644 --- a/hwpack/wandboard-solo.conf +++ b/hwpack/wandboard-solo.conf @@ -8,8 +8,6 @@ conf_bl_listfile="bootloader-ng" #Bootloader Partition: conf_boot_fstype="ext2" -conf_boot_startmb="1" -conf_boot_endmb="96" bootloader_location="dd_uboot_boot" dd_uboot_bs="512" diff --git a/mk_mmc.sh b/mk_mmc.sh index 6637004..57c92ab 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -1467,6 +1467,21 @@ process_dtb_conf () { show_board_warning fi + echo "-----------------------------" + + #defaults, if not set... + if [ ! "${conf_boot_startmb}" ] ; then + echo "info: [conf_boot_startmb] undefined using default value: 1" + conf_boot_startmb="1" + fi + + if [ ! "${conf_boot_endmb}" ] ; then + echo "info: [conf_boot_endmb] undefined using default value: 96" + conf_boot_endmb="96" + fi + + + #error checking... if [ ! "${conf_boot_fstype}" ] ; then echo "Error: [conf_boot_fstype] not defined, stopping..." exit @@ -1485,16 +1500,6 @@ process_dtb_conf () { esac fi - if [ ! "${conf_boot_startmb}" ] ; then - echo "Warning: [conf_boot_startmb] was undefined setting as: 1" - conf_boot_startmb="1" - fi - - if [ ! "${conf_boot_endmb}" ] ; then - echo "Warning: [conf_boot_endmb] was undefined setting as: 96" - conf_boot_endmb="96" - fi - if [ "${conf_uboot_CONFIG_CMD_BOOTZ}" ] ; then conf_bootcmd="bootz" conf_normal_kernel_file=zImage