net: Move the DHCP command below the BOOTP command

[u-boot] / common / spl / spl_onenand.c

diff --git a/common/spl/spl_onenand.c b/common/spl/spl_onenand.c
index af7d82eb62f39959c1a2b194ec879e11fb0c9bb5..fc98e9cbe5806bbe376bb09993747dd2e540924d 100644 (file)
--- a/common/spl/spl_onenand.c
+++ b/common/spl/spl_onenand.c
@@ -14,9 +14,11 @@
 #include <asm/io.h>
 #include <onenand_uboot.h>
 
-int spl_onenand_load_image(void)
+static int spl_onenand_load_image(struct spl_image_info *spl_image,
+                                 struct spl_boot_device *bootdev)
 {
        struct image_header *header;
+       int ret;
 
        debug("spl: onenand\n");
 
@@ -25,9 +27,14 @@ int spl_onenand_load_image(void)
        /* Load u-boot */
        onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS,
                CONFIG_SYS_ONENAND_PAGE_SIZE, (void *)header);
-       spl_parse_image_header(header);
+       ret = spl_parse_image_header(spl_image, header);
+       if (ret)
+               return ret;
        onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS,
-               spl_image.size, (void *)spl_image.load_addr);
+               spl_image->size, (void *)spl_image->load_addr);
 
        return 0;
 }
+/* Use priorty 1 so that Ubi can override this */
+SPL_LOAD_IMAGE_METHOD("OneNAND", 1, BOOT_DEVICE_ONENAND,
+                     spl_onenand_load_image);