w1: Fix bus counting in w1_get_bus

[J-u-boot.git] / cmd / booti.c

diff --git a/cmd/booti.c b/cmd/booti.c
index 76d1255ec584503da09140ca87e0d5d08c9388a9..6ac39193db80bf0b0f46bdce44ff9e0ac69313cb 100644 (file)
--- a/cmd/booti.c
+++ b/cmd/booti.c
@@ -12,6 +12,7 @@
 #include <lmb.h>
 #include <log.h>
 #include <mapmem.h>
+#include <asm/global_data.h>
 #include <linux/kernel.h>
 #include <linux/sizes.h>
 
@@ -20,7 +21,7 @@ DECLARE_GLOBAL_DATA_PTR;
  * Image booting support
  */
 static int booti_start(struct cmd_tbl *cmdtp, int flag, int argc,
-                      char *const argv[], bootm_headers_t *images)
+                      char *const argv[], struct bootm_headers *images)
 {
        int ret;
        ulong ld;
@@ -42,7 +43,7 @@ static int booti_start(struct cmd_tbl *cmdtp, int flag, int argc,
                debug("*  kernel: default image load address = 0x%08lx\n",
                                image_load_addr);
        } else {
-               ld = simple_strtoul(argv[0], NULL, 16);
+               ld = hextoul(argv[0], NULL);
                debug("*  kernel: cmdline image address = 0x%08lx\n", ld);
        }