diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl.c | 4 | ||||
| -rw-r--r-- | common/spl/spl_onenand.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index bbf87096a7..cef5ff9580 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_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 f5e2f95b13..361a1b34db 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); |