diff options
| author | Simon Glass <sjg@chromium.org> | 2016-09-24 18:20:06 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-06 15:07:29 -0400 |
| commit | 56df46351ad56551f8ea7e54d217ea6b709e686c (patch) | |
| tree | c09a75c375816ec291bdbf6bf8ae8387cc56d8d0 | |
| parent | dd6bf9025c2fd8ef0860e6e3ff4c12bc202fc64a (diff) | |
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>
| -rw-r--r-- | common/spl/spl.c | 3 | ||||
| -rw-r--r-- | common/spl/spl_usb.c | 3 | ||||
| -rw-r--r-- | include/spl.h | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 84ae0034db7..d2e23bf2d80 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 f990336a3c4..2bc321ac5bd 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 78855214f17..7270cc21ae7 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); |