spl: Convert spl_ubi_load_image() to use linker list

[platform/kernel/u-boot.git] / common / spl / spl.c

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 3217099..9be256e 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -384,11 +384,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);
@@ -397,7 +392,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);