spl: Convert spl_net_load_image() to use linker list

Add a linker list declaration for this method and remove the explicit
switch() code. We need two variants - one for BOOT_DEVICE_CPGMAC and one for
BOOT_DEVICE_USBETH.

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 ac19e5ffcd17b75d0524eb3b96d32ef8207d9e3d..713c27fa2c7a48ebbbb2b3602d171194fdec4374 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -384,19 +384,6 @@ static int spl_load_image(u32 boot_device)
                return loader->load_image(&bootdev);
 
        switch (boot_device) {
-#ifdef CONFIG_SPL_ETH_SUPPORT
-       case BOOT_DEVICE_CPGMAC:
-#ifdef CONFIG_SPL_ETH_DEVICE
-               bootdev.boot_device_name = CONFIG_SPL_ETH_DEVICE;
-#endif
-               return spl_net_load_image(&bootdev);
-#endif
-#ifdef CONFIG_SPL_USBETH_SUPPORT
-       case BOOT_DEVICE_USBETH:
-               bootdev.boot_device_name = "usb_ether";
-               return spl_net_load_image(&bootdev);
-#endif
-#endif
 #ifdef CONFIG_SPL_BOARD_LOAD_IMAGE
        case BOOT_DEVICE_BOARD:
                return spl_board_load_image(&bootdev);

diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index 730f88e0d602e21b552a7f8170095f3d88f322f8..0cbd995d11238ac7b224c8534eebf213f700d4f7 100644 (file)
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -14,7 +14,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int spl_net_load_image(struct spl_boot_device *bootdev)
+#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)
+static int spl_net_load_image(struct spl_boot_device *bootdev)
 {
        int rv;
 
@@ -37,3 +38,26 @@ int spl_net_load_image(struct spl_boot_device *bootdev)
        return spl_parse_image_header(&spl_image,
                                      (struct image_header *)load_addr);
 }
+#endif
+
+#ifdef CONFIG_SPL_ETH_SUPPORT
+int spl_net_load_image_cpgmac(struct spl_boot_device *bootdev)
+{
+#ifdef CONFIG_SPL_ETH_DEVICE
+       bootdev->boot_device_name = CONFIG_SPL_ETH_DEVICE;
+#endif
+
+       return spl_net_load_image(bootdev);
+}
+SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_CPGMAC, spl_net_load_image_cpgmac);
+#endif
+
+#ifdef CONFIG_SPL_USBETH_SUPPORT
+int spl_net_load_image_usb(struct spl_boot_device *bootdev)
+{
+       bootdev->boot_device_name = "usb_ether";
+
+       return spl_net_load_image(bootdev);
+}
+SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_USBETH, spl_net_load_image_usb);
+#endif

diff --git a/include/spl.h b/include/spl.h
index d46ddd497f410f864b575b349c8bd6ed3da33906..d6b2c9079f6d9ada4e509b7c35e048e9733ab3a1 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -181,9 +181,6 @@ struct spl_image_loader {
                .load_image = __method, \
        }
 
-/* Ethernet SPL functions */
-int spl_net_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);