spl: Kconfig: Rename SPL_USBETH_SUPPORT to SPL_USB_ETHER to match with the U-boot...

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

diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index 0fba0172ea4d78c9a70e829c1e89e50bef4312f3..ef13145eeaff92b80e4099599acfea8c3fec7138 100644 (file)
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -11,33 +11,61 @@
 #include <errno.h>
 #include <spl.h>
 #include <net.h>
+#include <libfdt.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)
+#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)
+static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
+                              ulong count, void *buf)
+{
+       debug("%s: sector %lx, count %lx, buf %lx\n",
+             __func__, sector, count, (ulong)buf);
+       memcpy(buf, (void *)(load_addr + sector), count);
+       return count;
+}
+
 static int spl_net_load_image(struct spl_image_info *spl_image,
                              struct spl_boot_device *bootdev)
 {
+       struct image_header *header = (struct image_header *)load_addr;
        int rv;
 
        env_init();
        env_relocate();
-       setenv("autoload", "yes");
-       load_addr = CONFIG_SYS_TEXT_BASE - sizeof(struct image_header);
+       env_set("autoload", "yes");
        rv = eth_initialize();
        if (rv == 0) {
                printf("No Ethernet devices found\n");
                return -ENODEV;
        }
        if (bootdev->boot_device_name)
-               setenv("ethact", bootdev->boot_device_name);
+               env_set("ethact", bootdev->boot_device_name);
        rv = net_loop(BOOTP);
        if (rv < 0) {
                printf("Problem booting with BOOTP\n");
                return rv;
        }
-       return spl_parse_image_header(spl_image,
-                                     (struct image_header *)load_addr);
+
+       if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
+           image_get_magic(header) == FDT_MAGIC) {
+               struct spl_load_info load;
+
+               debug("Found FIT\n");
+               load.bl_len = 1;
+               load.read = spl_net_load_read;
+               rv = spl_load_simple_fit(spl_image, &load, 0, header);
+       } else {
+               debug("Legacy image\n");
+
+               rv = spl_parse_image_header(spl_image, header);
+               if (rv)
+                       return rv;
+
+               memcpy((void *)spl_image->load_addr, header, spl_image->size);
+       }
+
+       return rv;
 }
 #endif
 
@@ -55,7 +83,7 @@ SPL_LOAD_IMAGE_METHOD("eth device", 0, BOOT_DEVICE_CPGMAC,
                      spl_net_load_image_cpgmac);
 #endif
 
-#ifdef CONFIG_SPL_USBETH_SUPPORT
+#ifdef CONFIG_SPL_USB_ETHER
 int spl_net_load_image_usb(struct spl_image_info *spl_image,
                           struct spl_boot_device *bootdev)
 {