[U-Boot] [PATCH v2 11/27] spl: Convert spl_ubi_load_image() to use linker list

Simon Glass sjg at chromium.org
Sun Sep 25 02:20:01 CEST 2016


Add a linker list declaration for this method and remove the explicit
switch() code.

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

Changes in v2: None

 common/spl/spl.c     | 6 ------
 common/spl/spl_ubi.c | 3 +++
 include/spl.h        | 3 ---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 3162bf4..d6615f1 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -373,11 +373,6 @@ static int spl_load_image(u32 boot_device)
 		return loader->load_image(&bootdev);
 
 	switch (boot_device) {
-#ifdef CONFIG_SPL_UBI
-	case BOOT_DEVICE_NAND:
-	case BOOT_DEVICE_ONENAND:
-		return spl_ubi_load_image(&bootdev);
-#else
 #ifdef CONFIG_SPL_NAND_SUPPORT
 	case BOOT_DEVICE_NAND:
 		return spl_nand_load_image(&bootdev);
@@ -386,7 +381,6 @@ static int spl_load_image(u32 boot_device)
 	case BOOT_DEVICE_ONENAND:
 		return spl_onenand_load_image(&bootdev);
 #endif
-#endif
 #ifdef CONFIG_SPL_NOR_SUPPORT
 	case BOOT_DEVICE_NOR:
 		return spl_nor_load_image(&bootdev);
diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c
index d64e6cf..3ef00aa 100644
--- a/common/spl/spl_ubi.c
+++ b/common/spl/spl_ubi.c
@@ -76,3 +76,6 @@ out:
 #endif
 	return ret;
 }
+/* Use priorty 0 so that Ubi will override NAND and ONENAND methods */
+SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_NAND, spl_ubi_load_image);
+SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_ONENAND, spl_ubi_load_image);
diff --git a/include/spl.h b/include/spl.h
index dc57c66..cdcd88f 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -190,9 +190,6 @@ int spl_onenand_load_image(struct spl_boot_device *bootdev);
 /* NOR SPL functions */
 int spl_nor_load_image(struct spl_boot_device *bootdev);
 
-/* UBI SPL functions */
-int spl_ubi_load_image(struct spl_boot_device *bootdev);
-
 /* YMODEM SPL functions */
 int spl_ymodem_load_image(struct spl_boot_device *bootdev);
 
-- 
2.8.0.rc3.226.g39d4020



More information about the U-Boot mailing list