diff options
| -rw-r--r-- | common/spl/spl.c | 4 | ||||
| -rw-r--r-- | common/spl/spl_nor.c | 3 | ||||
| -rw-r--r-- | include/spl.h | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index cef5ff9580..978df64870 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_NOR_SUPPORT - case BOOT_DEVICE_NOR: - return spl_nor_load_image(&bootdev); -#endif #ifdef CONFIG_SPL_YMODEM_SUPPORT case BOOT_DEVICE_UART: return spl_ymodem_load_image(&bootdev); diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index f10d679922..b55fcc5cdb 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -7,7 +7,7 @@ #include <common.h> #include <spl.h> -int spl_nor_load_image(struct spl_boot_device *bootdev) +static int spl_nor_load_image(struct spl_boot_device *bootdev) { int ret; /* @@ -70,3 +70,4 @@ int spl_nor_load_image(struct spl_boot_device *bootdev) return 0; } +SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_NOR, spl_nor_load_image); diff --git a/include/spl.h b/include/spl.h index e26f06eff1..fd6ac01084 100644 --- a/include/spl.h +++ b/include/spl.h @@ -181,9 +181,6 @@ struct spl_image_loader { .load_image = __method, \ } -/* NOR SPL functions */ -int spl_nor_load_image(struct spl_boot_device *bootdev); - /* YMODEM SPL functions */ int spl_ymodem_load_image(struct spl_boot_device *bootdev); |