karo: merge with Ka-Ro specific tree for secure boot support

[karo-tx-uboot.git] / common / spl / spl_nand.c

diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index b7801cb4605f16c54c99f65e3e8ed93db5d3e564..f58c21a7d646a440add27647608fa0be6df123ae 100644 (file)
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -11,19 +11,26 @@
 #include <nand.h>
 
 #if defined(CONFIG_SPL_NAND_RAW_ONLY)
-void spl_nand_load_image(void)
+int spl_nand_load_image(void)
 {
+       int ret;
+
        nand_init();
 
-       nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
+       ret = nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
                            CONFIG_SYS_NAND_U_BOOT_SIZE,
                            (void *)CONFIG_SYS_NAND_U_BOOT_DST);
-       spl_set_header_raw_uboot();
        nand_deselect();
+       if (ret)
+               return ret;
+
+       spl_set_header_raw_uboot();
+       return 0;
 }
 #else
-void spl_nand_load_image(void)
+int spl_nand_load_image(void)
 {
+       int ret;
        struct image_header *header;
        int *src __attribute__((unused));
        int *dst __attribute__((unused));
@@ -32,7 +39,7 @@ void spl_nand_load_image(void)
        nand_init();
 
        /*use CONFIG_SYS_TEXT_BASE as temporary storage area */
-       header = (struct image_header *)(CONFIG_SYS_TEXT_BASE);
+       header = (struct image_header *)CONFIG_SYS_TEXT_BASE;
 #ifdef CONFIG_SPL_OS_BOOT
        if (!spl_start_uboot()) {
                /*
@@ -63,12 +70,12 @@ void spl_nand_load_image(void)
                        nand_spl_load_image(CONFIG_SYS_NAND_SPL_KERNEL_OFFS,
                                spl_image.size, (void *)spl_image.load_addr);
                        nand_deselect();
-                       return;
+                       return 0;
                } else {
-                       puts("The Expected Linux image was not "
-                               "found. Please check your NAND "
+                       printf("The Expected Linux image was not"
+                               "found. Please check your NAND"
                                "configuration.\n");
-                       puts("Trying to start u-boot now...\n");
+                       printf("Trying to start u-boot now...\n");
                }
        }
 #endif
@@ -87,11 +94,14 @@ void spl_nand_load_image(void)
 #endif
 #endif
        /* Load u-boot */
-       nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
-               sizeof(*header), (void *)header);
-       spl_parse_image_header(header);
-       nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
-               spl_image.size, (void *)spl_image.load_addr);
+       ret = nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
+                               CONFIG_SYS_NAND_PAGE_SIZE, (void *)header);
+       if (ret == 0) {
+               spl_parse_image_header(header);
+               ret = nand_spl_load_image(CONFIG_SYS_NAND_U_BOOT_OFFS,
+                                       spl_image.size, (void *)spl_image.load_addr);
+       }
        nand_deselect();
+       return ret;
 }
 #endif