summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2015-01-19 16:39:11 -0700
committerTom Rini <trini@ti.com>2015-01-30 09:19:16 -0500
commitcc11b39288c402ca14ebf4e4cc15c7a72569034b (patch)
tree8f17540aee64299c62e7db5d41857f831f4e4303
parent89fc8bbf44e2ce6d73e0c71a9e88e477e91bc0db (diff)
downloadblackbird-obmc-uboot-cc11b39288c402ca14ebf4e4cc15c7a72569034b.tar.gz
blackbird-obmc-uboot-cc11b39288c402ca14ebf4e4cc15c7a72569034b.zip
distro_bootcmd: read DHCP boot script name from a variable
Modify $bootcmd_dhcp to read the downloaded script filename from an environment variable rather than hard-coding it. This allows the user (or another script) to select a different script name if they want, without editing the whole value of $bootcmd_dhcp. Signed-off-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r--include/config_distro_bootcmd.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index 90ab21a727..49674f4537 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -110,7 +110,7 @@
#define BOOTENV_DEV_DHCP(devtypeu, devtypel, instance) \
"bootcmd_dhcp=" \
BOOTENV_RUN_USB_INIT \
- "if dhcp ${scriptaddr} boot.scr.uimg; then " \
+ "if dhcp ${scriptaddr} ${boot_script_dhcp}; then " \
"source ${scriptaddr}; " \
"fi\0"
#define BOOTENV_DEV_NAME_DHCP(devtypeu, devtypel, instance) \
@@ -154,6 +154,7 @@
BOOTENV_SHARED_IDE \
"boot_prefixes=/ /boot/\0" \
"boot_scripts=boot.scr.uimg boot.scr\0" \
+ "boot_script_dhcp=boot.scr.uimg\0" \
BOOTENV_BOOT_TARGETS \
\
"boot_extlinux=" \
OpenPOWER on IntegriCloud