From: Stephen Warren <swarren@nvidia.com>
Date: Mon, 19 Jan 2015 23:39:11 +0000 (-0700)
Subject: distro_bootcmd: read DHCP boot script name from a variable
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=cc11b39288c402ca14ebf4e4cc15c7a72569034b;p=u-boot.git

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>
---

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="                                                  \