diff mbox

[U-Boot,13/27] spl: Convert spl_onenand_load_image() to use linker list

Message ID 1474227917-9256-14-git-send-email-sjg@chromium.org
State Accepted
Commit afa6e6c48845bac39a73b41012e8d7a53b13598d
Delegated to: Tom Rini
Headers show

Commit Message

Simon Glass Sept. 18, 2016, 7:45 p.m. UTC 
Add a linker list declaration for this method and remove the explicit
switch() code.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 common/spl/spl.c         | 4 ----
 common/spl/spl_onenand.c | 4 +++-
 include/spl.h            | 3 ---
 3 files changed, 3 insertions(+), 8 deletions(-)
diff mbox

Patch

diff --git a/common/spl/spl.c b/common/spl/spl.c
index bc51852..701b930 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -373,10 +373,6 @@  static int spl_load_image(u32 boot_device)
 		return loader->load_image(&bootdev);
 
 	switch (boot_device) {
-#ifdef CONFIG_SPL_ONENAND_SUPPORT
-	case BOOT_DEVICE_ONENAND:
-		return spl_onenand_load_image(&bootdev);
-#endif
 #ifdef CONFIG_SPL_NOR_SUPPORT
 	case BOOT_DEVICE_NOR:
 		return spl_nor_load_image(&bootdev);
diff --git a/common/spl/spl_onenand.c b/common/spl/spl_onenand.c
index f5e2f95..361a1b3 100644
--- a/common/spl/spl_onenand.c
+++ b/common/spl/spl_onenand.c
@@ -14,7 +14,7 @@ 
 #include <asm/io.h>
 #include <onenand_uboot.h>
 
-int spl_onenand_load_image(struct spl_boot_device *bootdev)
+static int spl_onenand_load_image(struct spl_boot_device *bootdev)
 {
 	struct image_header *header;
 	int ret;
@@ -34,3 +34,5 @@  int spl_onenand_load_image(struct spl_boot_device *bootdev)
 
 	return 0;
 }
+/* Use priorty 1 so that Ubi can override this */
+SPL_LOAD_IMAGE_METHOD(1, BOOT_DEVICE_ONENAND, spl_onenand_load_image);
diff --git a/include/spl.h b/include/spl.h
index 86bddd8..b7a3592 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -181,9 +181,6 @@  struct spl_image_loader {
 		.load_image = __method, \
 	}
 
-/* OneNAND SPL functions */
-int spl_onenand_load_image(struct spl_boot_device *bootdev);
-
 /* NOR SPL functions */
 int spl_nor_load_image(struct spl_boot_device *bootdev);