From 2ffa6bf0039abbb5c7941284e54526783d142b7c Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Sat, 27 Apr 2013 10:20:04 -0500 Subject: [PATCH] u-boot: it is assumed uEnv.txt will be loaded Signed-off-by: Robert Nelson --- hwpack/am335x-bone-serial.conf | 1 - hwpack/am335x-bone-video.conf | 1 - hwpack/am335x-boneblack.conf | 1 - hwpack/docs.txt | 2 -- hwpack/imx51-babbage.conf | 1 - hwpack/imx53-qsb.conf | 1 - hwpack/imx6q-sabrelite.conf | 1 - hwpack/imx6q-sabresd.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.9-dt.conf | 1 - hwpack/omap4-panda.conf | 1 - hwpack/requirements.txt | 4 ++++ hwpack/wandboard-dl.conf | 1 - hwpack/wandboard-solo.conf | 1 - mk_mmc.sh | 3 --- 18 files changed, 4 insertions(+), 20 deletions(-) create mode 100644 hwpack/requirements.txt diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf index 5cce7e7..7b9d3c7 100644 --- a/hwpack/am335x-bone-serial.conf +++ b/hwpack/am335x-bone-serial.conf @@ -28,7 +28,6 @@ conf_uboot_CONFIG_CMD_BOOTZ=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1 #Bootloader: u-boot settings -boot_script="uEnv.txt" boot_fstype="fat" uboot_SCRIPT_ENTRY="uenvcmd" uboot_fdt_auto_detection=1 diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf index 76d4fcd..7469641 100644 --- a/hwpack/am335x-bone-video.conf +++ b/hwpack/am335x-bone-video.conf @@ -28,7 +28,6 @@ conf_uboot_CONFIG_CMD_BOOTZ=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1 #Bootloader: u-boot settings -boot_script="uEnv.txt" boot_fstype="fat" uboot_SCRIPT_ENTRY="uenvcmd" uboot_fdt_auto_detection=1 diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf index 34ef268..ec8dde2 100644 --- a/hwpack/am335x-boneblack.conf +++ b/hwpack/am335x-boneblack.conf @@ -28,7 +28,6 @@ conf_uboot_CONFIG_CMD_BOOTZ=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1 #Bootloader: u-boot settings -boot_script="uEnv.txt" boot_fstype="fat" uboot_SCRIPT_ENTRY="uenvcmd" uboot_fdt_auto_detection=1 diff --git a/hwpack/docs.txt b/hwpack/docs.txt index c7b0408..59055b3 100644 --- a/hwpack/docs.txt +++ b/hwpack/docs.txt @@ -42,7 +42,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1 #Bootloader: u-boot settings -boot_script="uEnv.txt" boot_fstype="fat" uboot_SCRIPT_ENTRY="loaduimage" @@ -59,7 +58,6 @@ unset spl_name boot_name="u-boot.imx" #Bootloader: u-boot settings -boot_script="uEnv.txt" boot_fstype="ext2" uboot_SCRIPT_ENTRY="uenvcmd" diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf index 3689247..983598e 100644 --- a/hwpack/imx51-babbage.conf +++ b/hwpack/imx51-babbage.conf @@ -33,7 +33,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1 #Bootloader: u-boot settings -boot_script="uEnv.txt" boot_fstype="ext2" uboot_SCRIPT_ENTRY="uenvcmd" diff --git a/hwpack/imx53-qsb.conf b/hwpack/imx53-qsb.conf index 5583115..46cfcd1 100644 --- a/hwpack/imx53-qsb.conf +++ b/hwpack/imx53-qsb.conf @@ -33,7 +33,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1 #Bootloader: u-boot settings -boot_script="uEnv.txt" boot_fstype="ext2" uboot_SCRIPT_ENTRY="uenvcmd" diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf index 6dcabe0..0f708c5 100644 --- a/hwpack/imx6q-sabrelite.conf +++ b/hwpack/imx6q-sabrelite.conf @@ -33,7 +33,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1 #Bootloader: u-boot settings -boot_script="uEnv.txt" boot_fstype="ext2" uboot_SCRIPT_ENTRY="uenvcmd" diff --git a/hwpack/imx6q-sabresd.conf b/hwpack/imx6q-sabresd.conf index caaa0a9..dbb3e0b 100644 --- a/hwpack/imx6q-sabresd.conf +++ b/hwpack/imx6q-sabresd.conf @@ -31,7 +31,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1 #Bootloader: u-boot settings -boot_script="uEnv.txt" boot_fstype="ext2" uboot_SCRIPT_ENTRY="uenvcmd" diff --git a/hwpack/omap3-beagle-xm-v3.9-dt.conf b/hwpack/omap3-beagle-xm-v3.9-dt.conf index b8e80a4..54b906b 100644 --- a/hwpack/omap3-beagle-xm-v3.9-dt.conf +++ b/hwpack/omap3-beagle-xm-v3.9-dt.conf @@ -28,7 +28,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 #conf_uboot_CONFIG_CMD_FS_GENERIC=1 #Bootloader: u-boot settings -boot_script="uEnv.txt" boot_fstype="fat" uboot_SCRIPT_ENTRY="uenvcmd" diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf index 919082f..b30f167 100644 --- a/hwpack/omap3-beagle-xm.conf +++ b/hwpack/omap3-beagle-xm.conf @@ -28,7 +28,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 #conf_uboot_CONFIG_CMD_FS_GENERIC=1 #Bootloader: u-boot settings -boot_script="uEnv.txt" boot_fstype="fat" uboot_SCRIPT_ENTRY="uenvcmd" diff --git a/hwpack/omap4-panda-a4.conf b/hwpack/omap4-panda-a4.conf index d7e35f4..4ad9000 100644 --- a/hwpack/omap4-panda-a4.conf +++ b/hwpack/omap4-panda-a4.conf @@ -28,7 +28,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1 #Bootloader: u-boot settings -boot_script="uEnv.txt" boot_fstype="fat" uboot_SCRIPT_ENTRY="uenvcmd" diff --git a/hwpack/omap4-panda-es.conf b/hwpack/omap4-panda-es.conf index e669825..a232a10 100644 --- a/hwpack/omap4-panda-es.conf +++ b/hwpack/omap4-panda-es.conf @@ -28,7 +28,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1 #Bootloader: u-boot settings -boot_script="uEnv.txt" boot_fstype="fat" uboot_SCRIPT_ENTRY="uenvcmd" diff --git a/hwpack/omap4-panda-v3.9-dt.conf b/hwpack/omap4-panda-v3.9-dt.conf index 1f35dd5..b0f1eff 100644 --- a/hwpack/omap4-panda-v3.9-dt.conf +++ b/hwpack/omap4-panda-v3.9-dt.conf @@ -28,7 +28,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1 #Bootloader: u-boot settings -boot_script="uEnv.txt" boot_fstype="fat" uboot_SCRIPT_ENTRY="uenvcmd" diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf index f4e400e..57da2d4 100644 --- a/hwpack/omap4-panda.conf +++ b/hwpack/omap4-panda.conf @@ -28,7 +28,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1 #Bootloader: u-boot settings -boot_script="uEnv.txt" boot_fstype="fat" uboot_SCRIPT_ENTRY="uenvcmd" diff --git a/hwpack/requirements.txt b/hwpack/requirements.txt new file mode 100644 index 0000000..7dd5656 --- /dev/null +++ b/hwpack/requirements.txt @@ -0,0 +1,4 @@ +U-Boot Requirements: + +#Bootscripts +uEnv.txt (or boot.scr: via: boot_scr_wrapper=1) diff --git a/hwpack/wandboard-dl.conf b/hwpack/wandboard-dl.conf index 22f4050..78fc5e5 100644 --- a/hwpack/wandboard-dl.conf +++ b/hwpack/wandboard-dl.conf @@ -33,7 +33,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1 #Bootloader: u-boot settings -boot_script="uEnv.txt" boot_fstype="ext2" uboot_SCRIPT_ENTRY="uenvcmd" diff --git a/hwpack/wandboard-solo.conf b/hwpack/wandboard-solo.conf index 5bd5902..5009d92 100644 --- a/hwpack/wandboard-solo.conf +++ b/hwpack/wandboard-solo.conf @@ -33,7 +33,6 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1 #Bootloader: u-boot settings -boot_script="uEnv.txt" boot_fstype="ext2" uboot_SCRIPT_ENTRY="uenvcmd" diff --git a/mk_mmc.sh b/mk_mmc.sh index b2f32a8..d4c39ac 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -986,7 +986,6 @@ initrd_device_settings () { dd_uboot_bs=${dd_uboot_bs} conf_bootcmd=${conf_bootcmd} - boot_script=${boot_script} boot_fstype=${boot_fstype} serial_tty=${SERIAL} @@ -1258,7 +1257,6 @@ populate_boot () { dd_uboot_bs=${dd_uboot_bs} conf_bootcmd=${conf_bootcmd} - boot_script=${boot_script} boot_fstype=${boot_fstype} serial_tty=${SERIAL} @@ -1473,7 +1471,6 @@ is_omap () { conf_initrdaddr="0x81600000" conf_zreladdr="0x80008000" conf_fdtaddr="0x815f0000" - boot_script="uEnv.txt" boot_fstype="fat"