diff options
| author | Simon Glass <sjg@chromium.org> | 2016-09-24 18:20:05 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-06 15:06:59 -0400 |
| commit | dd6bf9025c2fd8ef0860e6e3ff4c12bc202fc64a (patch) | |
| tree | a2bd8701f92f3107469250fff8b1b93d2d922768 | |
| parent | 548b3ee73ca6fc042b85e0b171be36d942eeffb5 (diff) | |
| download | u-boot-dd6bf9025c2fd8ef0860e6e3ff4c12bc202fc64a.tar.gz | |
spl: Convert spl_ymodem_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_ymodem.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 978df64870..84ae0034db 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_YMODEM_SUPPORT - case BOOT_DEVICE_UART: - return spl_ymodem_load_image(&bootdev); -#endif #if defined(CONFIG_SPL_SPI_SUPPORT) || defined(CONFIG_SPL_SPI_FLASH_SUPPORT) case BOOT_DEVICE_SPI: return spl_spi_load_image(&bootdev); diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c index d82b138568..168b9511d9 100644 --- a/common/spl/spl_ymodem.c +++ b/common/spl/spl_ymodem.c @@ -68,7 +68,7 @@ static ulong ymodem_read_fit(struct spl_load_info *load, ulong offset, return size; } -int spl_ymodem_load_image(struct spl_boot_device *bootdev) +static int spl_ymodem_load_image(struct spl_boot_device *bootdev) { int size = 0; int err; @@ -132,3 +132,4 @@ end_stream: printf("Loaded %d bytes\n", size); return 0; } +SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_UART, spl_ymodem_load_image); diff --git a/include/spl.h b/include/spl.h index fd6ac01084..78855214f1 100644 --- a/include/spl.h +++ b/include/spl.h @@ -181,9 +181,6 @@ struct spl_image_loader { .load_image = __method, \ } -/* YMODEM SPL functions */ -int spl_ymodem_load_image(struct spl_boot_device *bootdev); - /* SPI SPL functions */ int spl_spi_load_image(struct spl_boot_device *bootdev); |