From 56df46351ad56551f8ea7e54d217ea6b709e686c Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Sat, 24 Sep 2016 18:20:06 -0600
Subject: [PATCH] spl: Convert spl_usb_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 | 3 ---
common/spl/spl_usb.c | 3 ++-
include/spl.h | 3 ---
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 84ae0034db..d2e23bf2d8 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -400,9 +400,6 @@ static int spl_load_image(u32 boot_device)
bootdev.boot_device_name = "usb_ether";
return spl_net_load_image(&bootdev);
#endif
-#ifdef CONFIG_SPL_USB_SUPPORT
- case BOOT_DEVICE_USB:
- return spl_usb_load_image(&bootdev);
#endif
#ifdef CONFIG_SPL_SATA_SUPPORT
case BOOT_DEVICE_SATA:
diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c
index f990336a3c..2bc321ac5b 100644
--- a/common/spl/spl_usb.c
+++ b/common/spl/spl_usb.c
@@ -22,7 +22,7 @@ DECLARE_GLOBAL_DATA_PTR;
static int usb_stor_curr_dev = -1; /* current device */
#endif
-int spl_usb_load_image(struct spl_boot_device *bootdev)
+static int spl_usb_load_image(struct spl_boot_device *bootdev)
{
int err;
struct blk_desc *stor_dev;
@@ -61,3 +61,4 @@ int spl_usb_load_image(struct spl_boot_device *bootdev)
return 0;
}
+SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_USB, spl_usb_load_image);
diff --git a/include/spl.h b/include/spl.h
index 78855214f1..7270cc21ae 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -187,9 +187,6 @@ int spl_spi_load_image(struct spl_boot_device *bootdev);
/* Ethernet SPL functions */
int spl_net_load_image(struct spl_boot_device *bootdev);
-/* USB SPL functions */
-int spl_usb_load_image(struct spl_boot_device *bootdev);
-
/* SATA SPL functions */
int spl_sata_load_image(struct spl_boot_device *bootdev);
--
2.39.5