From 548b3ee73ca6fc042b85e0b171be36d942eeffb5 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Sat, 24 Sep 2016 18:20:04 -0600
Subject: [PATCH] spl: Convert spl_nor_load_image() to use linker list
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>
---
common/spl/spl.c | 4 ----
common/spl/spl_nor.c | 3 ++-
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);
--
2.39.5