summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-09-24 18:20:02 -0600
committerTom Rini <trini@konsulko.com>2016-10-06 15:06:57 -0400
commitd5c2b11ce40f8ca849008938515e742e6b7efc18 (patch)
tree96a7b6c6143ef47e11eaf06ca07e615d10f73d2e
parent7d7dd821b0921d762a1dbfae48f2c3aa3ff29df6 (diff)
spl: Convert spl_nand_load_image() to use linker list
Add a linker list declaration for this method and remove the explicit switch() code. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
-rw-r--r--common/spl/spl.c4
-rw-r--r--common/spl/spl_nand.c4
-rw-r--r--include/spl.h3
3 files changed, 3 insertions, 8 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 9be256e313..bbf87096a7 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -384,10 +384,6 @@ static int spl_load_image(u32 boot_device)
return loader->load_image(&bootdev);
switch (boot_device) {
-#ifdef CONFIG_SPL_NAND_SUPPORT
- case BOOT_DEVICE_NAND:
- return spl_nand_load_image(&bootdev);
-#endif
#ifdef CONFIG_SPL_ONENAND_SUPPORT
case BOOT_DEVICE_ONENAND:
return spl_onenand_load_image(&bootdev);
diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index 575de661d3..ed758e518c 100644
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -67,7 +67,7 @@ static int spl_nand_load_element(int offset, struct image_header *header)
}
}
-int spl_nand_load_image(void)
+static int spl_nand_load_image(struct spl_boot_device *bootdev)
{
int err;
struct image_header *header;
@@ -145,3 +145,5 @@ int spl_nand_load_image(void)
return err;
}
#endif
+/* Use priorty 1 so that Ubi can override this */
+SPL_LOAD_IMAGE_METHOD(1, BOOT_DEVICE_NAND, spl_nand_load_image);
diff --git a/include/spl.h b/include/spl.h
index 47c10451fe..927f300f3d 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -181,9 +181,6 @@ struct spl_image_loader {
.load_image = __method, \
}
-/* NAND SPL functions */
-int spl_nand_load_image(struct spl_boot_device *bootdev);
-
/* OneNAND SPL functions */
int spl_onenand_load_image(struct spl_boot_device *bootdev);