summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-12-26 23:32:22 -0500
committerMike Frysinger <vapier@gentoo.org>2011-04-13 15:56:39 -0400
commita641b9794bc240b272008edf0309eb9dc9187bbc (patch)
tree887d56c7c127ea04438d4cc1ebf7816ff428ee13
parent0c79cda01b75e2f263ec4a5dd81f693b37392ea9 (diff)
downloadu-boot-imx-a641b9794bc240b272008edf0309eb9dc9187bbc.zip
u-boot-imx-a641b9794bc240b272008edf0309eb9dc9187bbc.tar.gz
u-boot-imx-a641b9794bc240b272008edf0309eb9dc9187bbc.tar.bz2
make `go` optional
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--README1
-rw-r--r--common/cmd_boot.c4
-rw-r--r--include/config_cmd_defaults.h1
3 files changed, 6 insertions, 0 deletions
diff --git a/README b/README
index bc3e905..f34cffa 100644
--- a/README
+++ b/README
@@ -644,6 +644,7 @@ The following options need to be configured:
CONFIG_CMD_FDOS * Dos diskette Support
CONFIG_CMD_FLASH flinfo, erase, protect
CONFIG_CMD_FPGA FPGA device initialization support
+ CONFIG_CMD_GO * the 'go' command (exec code)
CONFIG_CMD_HWFLOW * RTS/CTS hw flow control
CONFIG_CMD_I2C * I2C serial bus support
CONFIG_CMD_IDE * IDE harddisk support
diff --git a/common/cmd_boot.c b/common/cmd_boot.c
index 7b603d3..0afd939 100644
--- a/common/cmd_boot.c
+++ b/common/cmd_boot.c
@@ -28,6 +28,8 @@
#include <command.h>
#include <net.h>
+#ifdef CONFIG_CMD_GO
+
/* Allow ports to override the default behavior */
__attribute__((weak))
unsigned long do_go_exec (ulong (*entry)(int, char * const []), int argc, char * const argv[])
@@ -67,6 +69,8 @@ U_BOOT_CMD(
" passing 'arg' as arguments"
);
+#endif
+
U_BOOT_CMD(
reset, 1, 0, do_reset,
"Perform RESET of the CPU",
diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h
index 6adebdb..79c0495 100644
--- a/include/config_cmd_defaults.h
+++ b/include/config_cmd_defaults.h
@@ -11,6 +11,7 @@
#define CONFIG_CMD_BOOTM 1
#define CONFIG_CMD_EXPORTENV 1
+#define CONFIG_CMD_GO 1
#define CONFIG_CMD_IMPORTENV 1
#endif