Merge git://git.denx.de/u-boot-mpc85xx

[oweals/u-boot.git] / common / spl / spl_net.c

diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index ff53705926ace68ec37d001b942090303d077ca4..f4b4bc483397fc6104922f56de014c5408e2435c 100644 (file)
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -8,12 +8,15 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
+#include <errno.h>
 #include <spl.h>
 #include <net.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-void spl_net_load_image(const char *device)
+#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)
+static int spl_net_load_image(struct spl_image_info *spl_image,
+                             struct spl_boot_device *bootdev)
 {
        int rv;
 
@@ -21,17 +24,43 @@ void spl_net_load_image(const char *device)
        env_relocate();
        setenv("autoload", "yes");
        load_addr = CONFIG_SYS_TEXT_BASE - sizeof(struct image_header);
-       rv = eth_initialize(gd->bd);
+       rv = eth_initialize();
        if (rv == 0) {
                printf("No Ethernet devices found\n");
-               hang();
+               return -ENODEV;
        }
-       if (device)
-               setenv("ethact", device);
-       rv = NetLoop(BOOTP);
+       if (bootdev->boot_device_name)
+               setenv("ethact", bootdev->boot_device_name);
+       rv = net_loop(BOOTP);
        if (rv < 0) {
                printf("Problem booting with BOOTP\n");
-               hang();
+               return rv;
        }
-       spl_parse_image_header((struct image_header *)load_addr);
+       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_image_info *spl_image,
+                             struct spl_boot_device *bootdev)
+{
+#ifdef CONFIG_SPL_ETH_DEVICE
+       bootdev->boot_device_name = CONFIG_SPL_ETH_DEVICE;
+#endif
+
+       return spl_net_load_image(spl_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_image_info *spl_image,
+                          struct spl_boot_device *bootdev)
+{
+       bootdev->boot_device_name = "usb_ether";
+
+       return spl_net_load_image(spl_image, bootdev);
+}
+SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_USBETH, spl_net_load_image_usb);
+#endif