NAND: fix some strict-aliasing compiler warnings

[u-boot] / common / cmd_nand.c

diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index b099afeca0ed035dc69c5c1a7ba7208ac805aece..f8fce0ea438985b6b5fc85f7631a4ea014a16300 100644 (file)
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -93,7 +93,7 @@ static inline int str2long(char *p, ulong *num)
 }
 
 static int
-arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, ulong *size)
+arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, size_t *size)
 {
        int idx = nand_curr_device;
 #if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
@@ -136,7 +136,7 @@ arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, ulong *size)
        }
 
        if (argc >= 2) {
-               if (!(str2long(argv[1], size))) {
+               if (!(str2long(argv[1], (ulong *)size))) {
                        printf("'%s' is not a number\n", argv[1]);
                        return -1;
                }
@@ -158,7 +158,8 @@ out:
 int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
        int i, dev, ret;
-       ulong addr, off, size;
+       ulong addr, off;
+       size_t size;
        char *cmd, *s;
        nand_info_t *nand;
 #ifdef CFG_NAND_QUIET
@@ -350,10 +351,10 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                } else if (s != NULL && !strcmp(s, ".oob")) {
                        /* read out-of-band data */
                        if (read)
-                               ret = nand->read_oob(nand, off, size, (size_t *) &size,
+                               ret = nand->read_oob(nand, off, size, &size,
                                                     (u_char *) addr);
                        else
-                               ret = nand->write_oob(nand, off, size, (size_t *) &size,
+                               ret = nand->write_oob(nand, off, size, &size,
                                                      (u_char *) addr);
                } else {
                        if (read)
@@ -481,9 +482,12 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
 {
        int r;
        char *ep, *s;
-       ulong cnt;
+       size_t cnt;
        image_header_t *hdr;
        int jffs2 = 0;
+#if defined(CONFIG_FIT)
+       const void *fit_hdr;
+#endif
 
        s = strchr(cmd, '.');
        if (s != NULL &&
@@ -512,28 +516,31 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
        }
        show_boot_progress (56);
 
-       switch (gen_image_get_format ((void *)addr)) {
+       switch (genimg_get_format ((void *)addr)) {
        case IMAGE_FORMAT_LEGACY:
                hdr = (image_header_t *)addr;
 
-               if (!image_check_magic (hdr)) {
-                       printf("\n** Bad Magic Number 0x%x **\n",
-                                       image_get_magic (hdr));
-                       show_boot_progress (-57);
-                       return 1;
-               }
                show_boot_progress (57);
-
                image_print_contents (hdr);
 
                cnt = image_get_image_size (hdr);
                break;
 #if defined(CONFIG_FIT)
        case IMAGE_FORMAT_FIT:
-               fit_unsupported ("nand_load_image");
-               return 1;
+               fit_hdr = (const void *)addr;
+               if (!fit_check_format (fit_hdr)) {
+                       show_boot_progress (-150);
+                       puts ("** Bad FIT image format\n");
+                       return 1;
+               }
+               show_boot_progress (151);
+               puts ("Fit image detected...\n");
+
+               cnt = fit_get_size (fit_hdr);
+               break;
 #endif
        default:
+               show_boot_progress (-57);
                puts ("** Unknown image type\n");
                return 1;
        }
@@ -557,6 +564,12 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
        }
        show_boot_progress (58);
 
+#if defined(CONFIG_FIT)
+       /* This cannot be done earlier, we need complete FIT image in RAM first */
+       if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT)
+               fit_print_contents ((const void *)addr);
+#endif
+
        /* Loading ok, update default load address */
 
        load_addr = addr;
@@ -839,11 +852,11 @@ int do_nand (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                                /* read out-of-band data */
                                if (cmd & NANDRW_READ) {
                                        ret = nand_read_oob (nand_dev_desc + curr_device,
-                                                            off, size, (size_t *) & total,
+                                                            off, size, &total,
                                                             (u_char *) addr);
                                } else {
                                        ret = nand_write_oob (nand_dev_desc + curr_device,
-                                                             off, size, (size_t *) & total,
+                                                             off, size, &total,
                                                              (u_char *) addr);
                                }
                                return ret;
@@ -879,7 +892,7 @@ int do_nand (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
                        ret = nand_legacy_rw (nand_dev_desc + curr_device,
                                              cmd, off, size,
-                                             (size_t *) & total,
+                                             &total,
                                              (u_char *) addr);
 
                        printf (" %d bytes %s: %s\n", total,
@@ -939,6 +952,10 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        ulong offset = 0;
        image_header_t *hdr;
        int rcode = 0;
+#if defined(CONFIG_FIT)
+       const void *fit_hdr;
+#endif
+
        show_boot_progress (52);
        switch (argc) {
        case 1:
@@ -994,29 +1011,30 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        }
        show_boot_progress (56);
 
-       switch (gen_image_get_format ((void *)addr)) {
+       switch (genimg_get_format ((void *)addr)) {
        case IMAGE_FORMAT_LEGACY:
                hdr = (image_header_t *)addr;
+               image_print_contents (hdr);
 
-               if (image_check_magic (hdr)) {
-
-                       image_print_contents (hdr);
-
-                       cnt = image_get_image_size (hdr);
-                       cnt -= SECTORSIZE;
-               } else {
-                       printf ("\n** Bad Magic Number 0x%x **\n",
-                                       image_get_magic (hdr));
-                       show_boot_progress (-57);
-                       return 1;
-               }
+               cnt = image_get_image_size (hdr);
+               cnt -= SECTORSIZE;
                break;
 #if defined(CONFIG_FIT)
        case IMAGE_FORMAT_FIT:
-               fit_unsupported ("nboot");
-               return 1;
+               fit_hdr = (const void *)addr;
+               if (!fit_check_format (fit_hdr)) {
+                       show_boot_progress (-150);
+                       puts ("** Bad FIT image format\n");
+                       return 1;
+               }
+               show_boot_progress (151);
+               puts ("Fit image detected...\n");
+
+               cnt = fit_get_size (fit_hdr);
+               break;
 #endif
        default:
+               show_boot_progress (-57);
                puts ("** Unknown image type\n");
                return 1;
        }
@@ -1031,6 +1049,12 @@ int do_nandboot (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        }
        show_boot_progress (58);
 
+#if defined(CONFIG_FIT)
+       /* This cannot be done earlier, we need complete FIT image in RAM first */
+       if (genimg_get_format ((void *)addr) == IMAGE_FORMAT_FIT)
+               fit_print_contents ((const void *)addr);
+#endif
+
        /* Loading ok, update default load address */
 
        load_addr = addr;