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>

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 978df648706b02931c6c64c9ac3cb069c60aec62..84ae0034db7ed38a611cd08e75abeb12cf8bb333 100644 (file)
--- 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 d82b138568aae268ae5b146ba756aafa4aa4ee7a..168b9511d9e60975d36b0c0bc0381070aaa84df7 100644 (file)
--- 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 fd6ac01084ee4efd23e3cd76ad500e3d8324f6eb..78855214f17057bd73fd1036cf4a82baa9f3d209 100644 (file)
--- 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);