Convert CONFIG_SYS_NAND_ONFI_DETECTION to Kconfig

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

diff --git a/cmd/source.c b/cmd/source.c
index 3a51ebf..81e015b 100644 (file)
--- a/cmd/source.c
+++ b/cmd/source.c
@@ -18,6 +18,7 @@
 #include <command.h>
 #include <env.h>
 #include <image.h>
+#include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
 #include <asm/byteorder.h>
@@ -41,8 +42,7 @@ static const char *get_default_image(const void *fit)
 }
 #endif
 
-int
-source (ulong addr, const char *fit_uname)
+int image_source_script(ulong addr, const char *fit_uname)
 {
        ulong           len;
 #if defined(CONFIG_LEGACY_IMAGE_FORMAT)
@@ -107,7 +107,7 @@ source (ulong addr, const char *fit_uname)
 #if defined(CONFIG_FIT)
        case IMAGE_FORMAT_FIT:
                fit_hdr = buf;
-               if (!fit_check_format (fit_hdr)) {
+               if (fit_check_format(fit_hdr, IMAGE_SIZE_INVAL)) {
                        puts ("Bad FIT image format\n");
                        return 1;
                }
@@ -155,13 +155,14 @@ source (ulong addr, const char *fit_uname)
                return 1;
        }
 
-       debug ("** Script length: %ld\n", len);
+       debug("** Script length: %ld\n", len);
        return run_command_list((char *)data, len, 0);
 }
 
 /**************************************************/
 #if defined(CONFIG_CMD_SOURCE)
-static int do_source(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_source(struct cmd_tbl *cmdtp, int flag, int argc,
+                    char *const argv[])
 {
        ulong addr;
        int rcode;
@@ -170,19 +171,20 @@ static int do_source(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        /* Find script image */
        if (argc < 2) {
                addr = CONFIG_SYS_LOAD_ADDR;
-               debug ("*  source: default load address = 0x%08lx\n", addr);
+               debug("*  source: default load address = 0x%08lx\n", addr);
 #if defined(CONFIG_FIT)
-       } else if (fit_parse_subimage (argv[1], load_addr, &addr, &fit_uname)) {
-               debug ("*  source: subimage '%s' from FIT image at 0x%08lx\n",
-                               fit_uname, addr);
+       } else if (fit_parse_subimage(argv[1], image_load_addr, &addr,
+                                     &fit_uname)) {
+               debug("*  source: subimage '%s' from FIT image at 0x%08lx\n",
+                     fit_uname, addr);
 #endif
        } else {
-               addr = simple_strtoul(argv[1], NULL, 16);
-               debug ("*  source: cmdline image address = 0x%08lx\n", addr);
+               addr = hextoul(argv[1], NULL);
+               debug("*  source: cmdline image address = 0x%08lx\n", addr);
        }
 
        printf ("## Executing script at %08lx\n", addr);
-       rcode = source (addr, fit_uname);
+       rcode = image_source_script(addr, fit_uname);
        return rcode;
 }