Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / common / cmd_boot.c

diff --git a/common/cmd_boot.c b/common/cmd_boot.c
index 7b603d3502f2a7bec3cc111b9490e43dc568b658..d3836fdfd8536f16b0896cb0f533d30b2a3d8e19 100644 (file)
--- a/common/cmd_boot.c
+++ b/common/cmd_boot.c
@@ -28,20 +28,23 @@
 #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[])
+unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc,
+                                char * const argv[])
 {
        return entry (argc, argv);
 }
 
-int do_go (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_go(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        ulong   addr, rc;
        int     rcode = 0;
 
        if (argc < 2)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        addr = simple_strtoul(argv[1], NULL, 16);
 
@@ -67,6 +70,8 @@ U_BOOT_CMD(
        "      passing 'arg' as arguments"
 );
 
+#endif
+
 U_BOOT_CMD(
        reset, 1, 0,    do_reset,
        "Perform RESET of the CPU",