From d51506cb67d5fbe6c0024a3e7acf6e76329a9638 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Sat, 27 Apr 2013 10:34:31 -0500 Subject: [PATCH] uboot when avaiable use uenvcmd by default Signed-off-by: Robert Nelson --- hwpack/am335x-bone-serial.conf | 5 ++++- hwpack/am335x-bone-video.conf | 5 ++++- hwpack/am335x-boneblack.conf | 5 ++++- hwpack/docs.txt | 6 ++++-- hwpack/imx51-babbage.conf | 5 ++++- hwpack/imx53-qsb.conf | 5 ++++- hwpack/imx6q-sabrelite.conf | 5 ++++- hwpack/imx6q-sabresd.conf | 5 ++++- hwpack/omap3-beagle-xm-v3.9-dt.conf | 5 ++++- hwpack/omap3-beagle-xm.conf | 5 ++++- hwpack/omap4-panda-a4.conf | 5 ++++- hwpack/omap4-panda-es.conf | 5 ++++- hwpack/omap4-panda-v3.9-dt.conf | 5 ++++- hwpack/omap4-panda.conf | 5 ++++- hwpack/wandboard-dl.conf | 5 ++++- hwpack/wandboard-solo.conf | 5 ++++- mk_mmc.sh | 26 +++++++++++++++++--------- 17 files changed, 81 insertions(+), 26 deletions(-) diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf index 7b9d3c7..d2aa9be 100644 --- a/hwpack/am335x-bone-serial.conf +++ b/hwpack/am335x-bone-serial.conf @@ -27,9 +27,12 @@ conf_uboot_CONFIG_CMD_BOOTZ=1 #allows using "load" over "fatload"/"ext2load" conf_uboot_CONFIG_CMD_FS_GENERIC=1 +#uenvcmd avaiable? +conf_uboot_use_uenvcmd=1 +#conf_uboot_no_uenvcmd="loaduimage" + #Bootloader: u-boot settings boot_fstype="fat" -uboot_SCRIPT_ENTRY="uenvcmd" uboot_fdt_auto_detection=1 #Kernel: diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf index 7469641..a59e9c5 100644 --- a/hwpack/am335x-bone-video.conf +++ b/hwpack/am335x-bone-video.conf @@ -27,9 +27,12 @@ conf_uboot_CONFIG_CMD_BOOTZ=1 #allows using "load" over "fatload"/"ext2load" conf_uboot_CONFIG_CMD_FS_GENERIC=1 +#uenvcmd avaiable? +conf_uboot_use_uenvcmd=1 +#conf_uboot_no_uenvcmd="loaduimage" + #Bootloader: u-boot settings boot_fstype="fat" -uboot_SCRIPT_ENTRY="uenvcmd" uboot_fdt_auto_detection=1 #Kernel: diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf index ec8dde2..2d9a0d9 100644 --- a/hwpack/am335x-boneblack.conf +++ b/hwpack/am335x-boneblack.conf @@ -27,9 +27,12 @@ conf_uboot_CONFIG_CMD_BOOTZ=1 #allows using "load" over "fatload"/"ext2load" conf_uboot_CONFIG_CMD_FS_GENERIC=1 +#uenvcmd avaiable? +conf_uboot_use_uenvcmd=1 +#conf_uboot_no_uenvcmd="loaduimage" + #Bootloader: u-boot settings boot_fstype="fat" -uboot_SCRIPT_ENTRY="uenvcmd" uboot_fdt_auto_detection=1 #Kernel: diff --git a/hwpack/docs.txt b/hwpack/docs.txt index 59055b3..c205071 100644 --- a/hwpack/docs.txt +++ b/hwpack/docs.txt @@ -41,9 +41,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 #allows using "load" over "fatload"/"ext2load" conf_uboot_CONFIG_CMD_FS_GENERIC=1 +#uenvcmd avaiable? +conf_uboot_use_uenvcmd=1 +#conf_uboot_no_uenvcmd="loaduimage" + #Bootloader: u-boot settings boot_fstype="fat" -uboot_SCRIPT_ENTRY="loaduimage" [(3) Partition Setup] [imx and a mainline u-boot] @@ -59,7 +62,6 @@ boot_name="u-boot.imx" #Bootloader: u-boot settings boot_fstype="ext2" -uboot_SCRIPT_ENTRY="uenvcmd" [(4) Kernel Setup] [Raw Deb file or:] diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf index 983598e..161457e 100644 --- a/hwpack/imx51-babbage.conf +++ b/hwpack/imx51-babbage.conf @@ -32,9 +32,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 #allows using "load" over "fatload"/"ext2load" conf_uboot_CONFIG_CMD_FS_GENERIC=1 +#uenvcmd avaiable? +conf_uboot_use_uenvcmd=1 +#conf_uboot_no_uenvcmd="loaduimage" + #Bootloader: u-boot settings boot_fstype="ext2" -uboot_SCRIPT_ENTRY="uenvcmd" #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx diff --git a/hwpack/imx53-qsb.conf b/hwpack/imx53-qsb.conf index 46cfcd1..fd4071f 100644 --- a/hwpack/imx53-qsb.conf +++ b/hwpack/imx53-qsb.conf @@ -32,9 +32,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 #allows using "load" over "fatload"/"ext2load" conf_uboot_CONFIG_CMD_FS_GENERIC=1 +#uenvcmd avaiable? +conf_uboot_use_uenvcmd=1 +#conf_uboot_no_uenvcmd="loaduimage" + #Bootloader: u-boot settings boot_fstype="ext2" -uboot_SCRIPT_ENTRY="uenvcmd" #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf index 0f708c5..d18aa79 100644 --- a/hwpack/imx6q-sabrelite.conf +++ b/hwpack/imx6q-sabrelite.conf @@ -32,9 +32,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 #allows using "load" over "fatload"/"ext2load" conf_uboot_CONFIG_CMD_FS_GENERIC=1 +#uenvcmd avaiable? +conf_uboot_use_uenvcmd=1 +#conf_uboot_no_uenvcmd="loaduimage" + #Bootloader: u-boot settings boot_fstype="ext2" -uboot_SCRIPT_ENTRY="uenvcmd" #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx diff --git a/hwpack/imx6q-sabresd.conf b/hwpack/imx6q-sabresd.conf index dbb3e0b..e367f90 100644 --- a/hwpack/imx6q-sabresd.conf +++ b/hwpack/imx6q-sabresd.conf @@ -30,9 +30,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 #allows using "load" over "fatload"/"ext2load" conf_uboot_CONFIG_CMD_FS_GENERIC=1 +#uenvcmd avaiable? +conf_uboot_use_uenvcmd=1 +#conf_uboot_no_uenvcmd="loaduimage" + #Bootloader: u-boot settings boot_fstype="ext2" -uboot_SCRIPT_ENTRY="uenvcmd" #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx diff --git a/hwpack/omap3-beagle-xm-v3.9-dt.conf b/hwpack/omap3-beagle-xm-v3.9-dt.conf index 54b906b..259d6de 100644 --- a/hwpack/omap3-beagle-xm-v3.9-dt.conf +++ b/hwpack/omap3-beagle-xm-v3.9-dt.conf @@ -27,9 +27,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 #allows using "load" over "fatload"/"ext2load" #conf_uboot_CONFIG_CMD_FS_GENERIC=1 +#uenvcmd avaiable? +conf_uboot_use_uenvcmd=1 +#conf_uboot_no_uenvcmd="loaduimage" + #Bootloader: u-boot settings boot_fstype="fat" -uboot_SCRIPT_ENTRY="uenvcmd" #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf index b30f167..e7c62bb 100644 --- a/hwpack/omap3-beagle-xm.conf +++ b/hwpack/omap3-beagle-xm.conf @@ -27,9 +27,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 #allows using "load" over "fatload"/"ext2load" #conf_uboot_CONFIG_CMD_FS_GENERIC=1 +#uenvcmd avaiable? +conf_uboot_use_uenvcmd=1 +#conf_uboot_no_uenvcmd="loaduimage" + #Bootloader: u-boot settings boot_fstype="fat" -uboot_SCRIPT_ENTRY="uenvcmd" #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap diff --git a/hwpack/omap4-panda-a4.conf b/hwpack/omap4-panda-a4.conf index 4ad9000..807db1a 100644 --- a/hwpack/omap4-panda-a4.conf +++ b/hwpack/omap4-panda-a4.conf @@ -27,9 +27,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 #allows using "load" over "fatload"/"ext2load" conf_uboot_CONFIG_CMD_FS_GENERIC=1 +#uenvcmd avaiable? +conf_uboot_use_uenvcmd=1 +#conf_uboot_no_uenvcmd="loaduimage" + #Bootloader: u-boot settings boot_fstype="fat" -uboot_SCRIPT_ENTRY="uenvcmd" #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap diff --git a/hwpack/omap4-panda-es.conf b/hwpack/omap4-panda-es.conf index a232a10..bc86081 100644 --- a/hwpack/omap4-panda-es.conf +++ b/hwpack/omap4-panda-es.conf @@ -27,9 +27,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 #allows using "load" over "fatload"/"ext2load" conf_uboot_CONFIG_CMD_FS_GENERIC=1 +#uenvcmd avaiable? +conf_uboot_use_uenvcmd=1 +#conf_uboot_no_uenvcmd="loaduimage" + #Bootloader: u-boot settings boot_fstype="fat" -uboot_SCRIPT_ENTRY="uenvcmd" #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap diff --git a/hwpack/omap4-panda-v3.9-dt.conf b/hwpack/omap4-panda-v3.9-dt.conf index b0f1eff..b735e02 100644 --- a/hwpack/omap4-panda-v3.9-dt.conf +++ b/hwpack/omap4-panda-v3.9-dt.conf @@ -27,9 +27,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 #allows using "load" over "fatload"/"ext2load" conf_uboot_CONFIG_CMD_FS_GENERIC=1 +#uenvcmd avaiable? +conf_uboot_use_uenvcmd=1 +#conf_uboot_no_uenvcmd="loaduimage" + #Bootloader: u-boot settings boot_fstype="fat" -uboot_SCRIPT_ENTRY="uenvcmd" #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf index 57da2d4..657a5cb 100644 --- a/hwpack/omap4-panda.conf +++ b/hwpack/omap4-panda.conf @@ -27,9 +27,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 #allows using "load" over "fatload"/"ext2load" conf_uboot_CONFIG_CMD_FS_GENERIC=1 +#uenvcmd avaiable? +conf_uboot_use_uenvcmd=1 +#conf_uboot_no_uenvcmd="loaduimage" + #Bootloader: u-boot settings boot_fstype="fat" -uboot_SCRIPT_ENTRY="uenvcmd" #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap diff --git a/hwpack/wandboard-dl.conf b/hwpack/wandboard-dl.conf index 78fc5e5..aa89f30 100644 --- a/hwpack/wandboard-dl.conf +++ b/hwpack/wandboard-dl.conf @@ -32,9 +32,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 #allows using "load" over "fatload"/"ext2load" conf_uboot_CONFIG_CMD_FS_GENERIC=1 +#uenvcmd avaiable? +conf_uboot_use_uenvcmd=1 +#conf_uboot_no_uenvcmd="loaduimage" + #Bootloader: u-boot settings boot_fstype="ext2" -uboot_SCRIPT_ENTRY="uenvcmd" #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx diff --git a/hwpack/wandboard-solo.conf b/hwpack/wandboard-solo.conf index 5009d92..c875843 100644 --- a/hwpack/wandboard-solo.conf +++ b/hwpack/wandboard-solo.conf @@ -32,9 +32,12 @@ conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1 #allows using "load" over "fatload"/"ext2load" conf_uboot_CONFIG_CMD_FS_GENERIC=1 +#uenvcmd avaiable? +conf_uboot_use_uenvcmd=1 +#conf_uboot_no_uenvcmd="loaduimage" + #Bootloader: u-boot settings boot_fstype="ext2" -uboot_SCRIPT_ENTRY="uenvcmd" #Kernel: #http://rcn-ee.net/deb/wheezy-armhf/LATEST-imx diff --git a/mk_mmc.sh b/mk_mmc.sh index d4c39ac..f9f3b52 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -480,27 +480,27 @@ boot_uenv_txt_template () { if [ ! "${need_dtbs}" ] ; then cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ #Classic Board File Boot: - ${uboot_SCRIPT_ENTRY}=run boot_classic; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} + ${conf_entrypt}=run boot_classic; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} #New Device Tree Boot: - #${uboot_SCRIPT_ENTRY}=run boot_fdt; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr} + #${conf_entrypt}=run boot_fdt; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - ${uboot_SCRIPT_ENTRY}=run xyz_message; run boot_classic; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} + ${conf_entrypt}=run xyz_message; run boot_classic; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} __EOF__ else cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__ #Classic Board File Boot: - #${uboot_SCRIPT_ENTRY}=run boot_classic; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} + #${conf_entrypt}=run boot_classic; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} #New Device Tree Boot: - ${uboot_SCRIPT_ENTRY}=run boot_fdt; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr} + ${conf_entrypt}=run boot_fdt; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr} __EOF__ cat >> ${TEMPDIR}/bootscripts/netinstall.cmd <<-__EOF__ - ${uboot_SCRIPT_ENTRY}=run xyz_message; run boot_fdt; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr} + ${conf_entrypt}=run xyz_message; run boot_fdt; run device_args; ${conf_bootcmd} ${conf_loadaddr} ${conf_initrdaddr}:\${initrd_size} ${conf_fdtaddr} __EOF__ fi @@ -1220,7 +1220,7 @@ populate_boot () { echo "boot.scr -> uEnv.txt wrapper..." ${conf_fileload} mmc \${mmcdev}:\${mmcpart} \${loadaddr} uEnv.txt env import -t \${loadaddr} \${filesize} - run ${uboot_SCRIPT_ENTRY} + run ${conf_entrypt} __EOF__ mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "wrapper" -d ${TEMPDIR}/bootscripts/loader.cmd ${TEMPDIR}/disk/boot.scr cp -v ${TEMPDIR}/disk/boot.scr ${TEMPDIR}/disk/backup/boot.scr @@ -1433,6 +1433,12 @@ process_dtb_conf () { conf_fileload="ext2load" fi fi + + if [ "${conf_uboot_use_uenvcmd}" ] ; then + conf_entrypt="uenvcmd" + else + conf_entrypt="${conf_uboot_no_uenvcmd}" + fi } check_dtb_board () { @@ -1542,7 +1548,7 @@ check_uboot_type () { ;; bone-serial|bone) need_am335x_firmware="1" - uboot_SCRIPT_ENTRY="uenvcmd" + conf_entrypt="uenvcmd" SYSTEM="bone" conf_board="BEAGLEBONE_A" is_omap @@ -1561,11 +1567,12 @@ check_uboot_type () { conf_note="Note: During the install use a 5Volt DC power supply as USB does not always provide enough power. If board locks up on boot run [sudo ifconfig usb0 up] on host." conf_uboot_CONFIG_CMD_BOOTZ=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1 + conf_uboot_use_uenvcmd=1 convert_uboot_to_dtb_board ;; bone-video) need_am335x_firmware="1" - uboot_SCRIPT_ENTRY="uenvcmd" + conf_entrypt="uenvcmd" SYSTEM="bone" conf_board="BEAGLEBONE_A" is_omap @@ -1582,6 +1589,7 @@ check_uboot_type () { conf_note="Note: During the install use a 5Volt DC power supply as USB does not always provide enough power. If board locks up on boot run [sudo ifconfig usb0 up] on host." conf_uboot_CONFIG_CMD_BOOTZ=1 conf_uboot_CONFIG_CMD_FS_GENERIC=1 + conf_uboot_use_uenvcmd=1 convert_uboot_to_dtb_board ;; bone_dt|bone_dtb)