aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2015-01-05 18:13:39 +0100
committerTom Rini <trini@ti.com>2015-01-29 13:38:39 -0500
commit453c6cc19aaf4f03bbf4ef03493732a39d3780db (patch)
treedfdb2783b72b1cac91cbdf1576ff76b5b66ddd83
parent735b1cfeb2308d9114af1140b703be91b604c09e (diff)
downloadu-boot-453c6cc19aaf4f03bbf4ef03493732a39d3780db.zip
u-boot-453c6cc19aaf4f03bbf4ef03493732a39d3780db.tar.gz
u-boot-453c6cc19aaf4f03bbf4ef03493732a39d3780db.tar.bz2
distro_distro_bootcmd: use CONFIG_BOOTCOMMAND instead of setting bootcmd=
Move the bootcmd commands into a seperate distro_bootcmd environment variable. Allowing a user to easily launch the distro boot sequence if the default bootcmd did not default to distro boot commands. Also set CONFIG_BOOTCOMMAND to "run distro_bootcmd" if it hasn't been configured yet rather then putting it directly in the environment. This allows boards to make the distro boot commands available without necessarily default to them or to use them as a fallback after running some board specific commands instead. Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> Reviewed-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r--include/config_distro_bootcmd.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
index 676b351..90ab21a 100644
--- a/include/config_distro_bootcmd.h
+++ b/include/config_distro_bootcmd.h
@@ -202,9 +202,13 @@
\
BOOT_TARGET_DEVICES(BOOTENV_DEV) \
\
- "bootcmd=" BOOTENV_SET_SCSI_NEED_INIT \
+ "distro_bootcmd=" BOOTENV_SET_SCSI_NEED_INIT \
"for target in ${boot_targets}; do " \
"run bootcmd_${target}; " \
"done\0"
+#ifndef CONFIG_BOOTCOMMAND
+#define CONFIG_BOOTCOMMAND "run distro_bootcmd"
+#endif
+
#endif /* _CONFIG_CMD_DISTRO_BOOTCMD_H */