Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-19 11:24:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

config_distro_bootcmd.h: Use a private variable for bootpart

Browse source 
Hush has an oddity where using ${var} causes var to resolved in the the global
address space (iotw the environment) first and only afterwards will the local
variable space be searched.

This causes odd side-effects when iterating over the boot partitions
using ${bootpart} if the environment also has a bootpart variable (e.g. for
the various TI boards). Fix this by using the hopefully more unique
${distro_bootpart} instead of ${bootpart}.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
This commit is contained in:
Sjoerd Simons 2015-08-28 15:01:54 +02:00 • committed by Tom Rini
parent 2da87ab353
commit 59d03cb377
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/config_distro_bootcmd.h
View file

@ -191,11 +191,12 @@
BOOTENV_BOOT_TARGETS \ BOOTENV_BOOT_TARGETS \
\ \
"boot_extlinux=" \ "boot_extlinux=" \
"sysboot ${devtype} ${devnum}:${bootpart} any " \ "sysboot ${devtype} ${devnum}:${distro_bootpart} any " \
"${scriptaddr} ${prefix}extlinux/extlinux.conf\0" \ "${scriptaddr} ${prefix}extlinux/extlinux.conf\0" \
\ \
"scan_dev_for_extlinux=" \ "scan_dev_for_extlinux=" \
"if test -e ${devtype} ${devnum}:${bootpart} " \ "if test -e ${devtype} " \
"${devnum}:${distro_bootpart} " \
"${prefix}extlinux/extlinux.conf; then " \ "${prefix}extlinux/extlinux.conf; then " \
"echo Found ${prefix}extlinux/extlinux.conf; " \ "echo Found ${prefix}extlinux/extlinux.conf; " \
"run boot_extlinux; " \ "run boot_extlinux; " \
@ -203,13 +204,14 @@
"fi\0" \ "fi\0" \
\ \
"boot_a_script=" \ "boot_a_script=" \
"load ${devtype} ${devnum}:${bootpart} " \ "load ${devtype} ${devnum}:${distro_bootpart} " \
"${scriptaddr} ${prefix}${script}; " \ "${scriptaddr} ${prefix}${script}; " \
"source ${scriptaddr}\0" \ "source ${scriptaddr}\0" \
\ \
"scan_dev_for_scripts=" \ "scan_dev_for_scripts=" \
"for script in ${boot_scripts}; do " \ "for script in ${boot_scripts}; do " \
"if test -e ${devtype} ${devnum}:${bootpart} " \ "if test -e ${devtype} " \
"${devnum}:${distro_bootpart} " \
"${prefix}${script}; then " \ "${prefix}${script}; then " \
"echo Found U-Boot script " \ "echo Found U-Boot script " \
"${prefix}${script}; " \ "${prefix}${script}; " \
@ -219,7 +221,8 @@
"done\0" \ "done\0" \
\ \
"scan_dev_for_boot=" \ "scan_dev_for_boot=" \
"echo Scanning ${devtype} ${devnum}:${bootpart}...; " \ "echo Scanning ${devtype} " \
"${devnum}:${distro_bootpart}...; " \
"for prefix in ${boot_prefixes}; do " \ "for prefix in ${boot_prefixes}; do " \
"run scan_dev_for_extlinux; " \ "run scan_dev_for_extlinux; " \
"run scan_dev_for_scripts; " \ "run scan_dev_for_scripts; " \
@ -228,8 +231,9 @@
"scan_dev_for_boot_part=" \ "scan_dev_for_boot_part=" \
"part list ${devtype} ${devnum} -bootable devplist; " \ "part list ${devtype} ${devnum} -bootable devplist; " \
"env exists devplist || setenv devplist 1; " \ "env exists devplist || setenv devplist 1; " \
"for bootpart in ${devplist}; do " \ "for distro_bootpart in ${devplist}; do " \
"if fstype ${devtype} ${devnum}:${bootpart} " \ "if fstype ${devtype} " \
"${devnum}:${distro_bootpart} " \
"bootfstype; then " \ "bootfstype; then " \
"run scan_dev_for_boot; " \ "run scan_dev_for_boot; " \
"fi; " \ "fi; " \