Merge https://source.denx.de/u-boot/custodians/u-boot-spi

[platform/kernel/u-boot.git] / cmd / boot.c

diff --git a/cmd/boot.c b/cmd/boot.c
index 9150fce..be67a59 100644 (file)
--- a/cmd/boot.c
+++ b/cmd/boot.c
@@ -16,12 +16,12 @@
 /* Allow ports to override the default behavior */
 __attribute__((weak))
 unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc,
-                                char * const argv[])
+                                char *const argv[])
 {
        return entry (argc, argv);
 }
 
-static int do_go(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_go(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        ulong   addr, rc;
        int     rcode = 0;
@@ -29,7 +29,7 @@ static int do_go(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        if (argc < 2)
                return CMD_RET_USAGE;
 
-       addr = simple_strtoul(argv[1], NULL, 16);
+       addr = hextoul(argv[1], NULL);
 
        printf ("## Starting application at 0x%08lX ...\n", addr);
 
@@ -56,9 +56,10 @@ U_BOOT_CMD(
 #endif
 
 U_BOOT_CMD(
-       reset, 1, 0,    do_reset,
+       reset, 2, 0,    do_reset,
        "Perform RESET of the CPU",
-       ""
+       "- cold boot without level specifier\n"
+       "reset -w - warm reset if implemented"
 );
 
 #ifdef CONFIG_CMD_POWEROFF