Add a linker list declaration for this method and remove the explicit switch() code. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
@@ -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);
@@ -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);
@@ -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);