X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common%2Fcmd_boot.c;h=d3836fdfd8536f16b0896cb0f533d30b2a3d8e19;hb=e69c585d76b7c8f422ad488ea92268c60dc2a436;hp=efc1a0262f00786176410c5413281c692fb34841;hpb=c1b7c70083fc8d0bb77db20dd47bb6c988f3dc67;p=u-boot diff --git a/common/cmd_boot.c b/common/cmd_boot.c index efc1a0262f..d3836fdfd8 100644 --- a/common/cmd_boot.c +++ b/common/cmd_boot.c @@ -28,22 +28,23 @@ #include #include +#ifdef CONFIG_CMD_GO + /* Allow ports to override the default behavior */ __attribute__((weak)) -unsigned long do_go_exec (ulong (*entry)(int, char *[]), int argc, char *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 *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) { - cmd_usage(cmdtp); - return 1; - } + if (argc < 2) + return CMD_RET_USAGE; addr = simple_strtoul(argv[1], NULL, 16); @@ -66,13 +67,13 @@ U_BOOT_CMD( go, CONFIG_SYS_MAXARGS, 1, do_go, "start application at address 'addr'", "addr [arg ...]\n - start application at address 'addr'\n" - " passing 'arg' as arguments\n" + " passing 'arg' as arguments" ); -extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); +#endif U_BOOT_CMD( reset, 1, 0, do_reset, "Perform RESET of the CPU", - NULL + "" );