diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-20 22:57:35 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-20 22:57:35 +0200 |
| commit | 9dd5dad88777a7c6a63f8c103706b57364a135f4 (patch) | |
| tree | 20af70ec3c451858855478e720498be0b5a800a4 /common/cmd_boot.c | |
| parent | d7eb184af828ebde3834af2a0d54421fd1a57f63 (diff) | |
| parent | 6801201ee72795dddb1e23aa6091c95866b19e0b (diff) | |
| download | u-boot-imx-9dd5dad88777a7c6a63f8c103706b57364a135f4.zip u-boot-imx-9dd5dad88777a7c6a63f8c103706b57364a135f4.tar.gz u-boot-imx-9dd5dad88777a7c6a63f8c103706b57364a135f4.tar.bz2 | |
Merge branch 'misc' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'common/cmd_boot.c')
| -rw-r--r-- | common/cmd_boot.c | 4 |
1 files changed, 4 insertions, 0 deletions
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", |