diff options
| author | Simon Glass | 2016-09-24 18:20:07 -0600 |
|---|---|---|
| committer | Tom Rini | 2016-10-06 15:07:33 -0400 |
| commit | 7557147927fcc4099d62f564f42babc2370834f3 (patch) | |
| tree | b216c68d8b2f986c652e3639b5feeec528b8459d | |
| parent | 56df46351ad56551f8ea7e54d217ea6b709e686c (diff) | |
spl: Convert spl_sata_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 | 4 | ||||
| -rw-r--r-- | common/spl/spl_sata.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 d2e23bf2d80..9890a889abd 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -401,10 +401,6 @@ static int spl_load_image(u32 boot_device) return spl_net_load_image(&bootdev); #endif #endif -#ifdef CONFIG_SPL_SATA_SUPPORT - case BOOT_DEVICE_SATA: - return spl_sata_load_image(&bootdev); -#endif #ifdef CONFIG_SPL_BOARD_LOAD_IMAGE case BOOT_DEVICE_BOARD: return spl_board_load_image(&bootdev); diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c index 77fd73c9893..1a21c051a10 100644 --- a/common/spl/spl_sata.c +++ b/common/spl/spl_sata.c @@ -20,7 +20,7 @@ DECLARE_GLOBAL_DATA_PTR; -int spl_sata_load_image(struct spl_boot_device *bootdev) +static int spl_sata_load_image(struct spl_boot_device *bootdev) { int err; struct blk_desc *stor_dev; @@ -53,3 +53,4 @@ int spl_sata_load_image(struct spl_boot_device *bootdev) return 0; } +SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_SATA, spl_sata_load_image); diff --git a/include/spl.h b/include/spl.h index 7270cc21ae7..2d0e1287129 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); -/* SATA SPL functions */ -int spl_sata_load_image(struct spl_boot_device *bootdev); - /* SPL FAT image functions */ int spl_load_image_fat(struct blk_desc *block_dev, int partition, const char *filename); |