diff mbox

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

Message ID 1474227917-9256-13-git-send-email-sjg@chromium.org
State Accepted
Commit d5c2b11ce40f8ca849008938515e742e6b7efc18
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_nand.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 5ddc08d..bc51852 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_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 575de66..ed758e5 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 cdcd88f..86bddd8 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);