spl: Convert net to spl_load

This converts the net load method to use spl_load. As a result, it also
adds support for LOAD_FIT_FULL and IMX images.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index 47994e281657c6ff04de7c6d6e2ff2e1aeda67da..898f9df705a29996da45c7575695dc49be137284 100644 (file)
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -11,8 +11,8 @@
 #include <errno.h>
 #include <image.h>
 #include <log.h>
-#include <mapmem.h>
 #include <spl.h>
+#include <spl_load.h>
 #include <net.h>
 #include <linux/libfdt.h>
 
@@ -29,8 +29,7 @@ static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
 static int spl_net_load_image(struct spl_image_info *spl_image,
                              struct spl_boot_device *bootdev)
 {
-       struct legacy_img_hdr *header = map_sysmem(image_load_addr,
-                                                  sizeof(*header));
+       struct spl_load_info load;
        int rv;
 
        env_init();
@@ -49,27 +48,9 @@ static int spl_net_load_image(struct spl_image_info *spl_image,
                return rv;
        }
 
-       if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
-           image_get_magic(header) == FDT_MAGIC) {
-               struct spl_load_info load;
-
-               debug("Found FIT\n");
-               spl_set_bl_len(&load, 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, bootdev, header);
-               if (rv)
-                       return rv;
-
-               memcpy(map_sysmem(spl_image->load_addr, spl_image->size),
-                      map_sysmem(image_load_addr, spl_image->size),
-                      spl_image->size);
-       }
-
-       return rv;
+       spl_set_bl_len(&load, 1);
+       load.read = spl_net_load_read;
+       return spl_load(spl_image, bootdev, &load, 0, 0);
 }
 #endif
 

diff --git a/include/spl_load.h b/include/spl_load.h
index 38294a21ad0a49e6a02ec1f229dbf7572fe5103c..4777f84ac6b11b82d967eb20a5dac9db1c538e03 100644 (file)
--- a/include/spl_load.h
+++ b/include/spl_load.h
@@ -99,6 +99,7 @@ static inline int _spl_load(struct spl_image_info *spl_image,
        IS_ENABLED(CONFIG_SPL_FS_FAT) + \
        IS_ENABLED(CONFIG_SPL_SYS_MMCSD_RAW_MODE) + \
        (IS_ENABLED(CONFIG_SPL_NAND_SUPPORT) && !IS_ENABLED(CONFIG_SPL_UBI)) + \
+       IS_ENABLED(CONFIG_SPL_NET) + \
        0
 
 #if SPL_LOAD_USERS > 1

diff --git a/test/image/spl_load_net.c b/test/image/spl_load_net.c
index f570cef163f34e1d60a7bbbb123979f8739a3b61..9d067a7a592fed73a7ef8e9b6c18f7964a2ac2ef 100644 (file)
--- a/test/image/spl_load_net.c
+++ b/test/image/spl_load_net.c
@@ -248,5 +248,7 @@ static int spl_test_net(struct unit_test_state *uts, const char *test_name,
        return ret;
 }
 SPL_IMG_TEST(spl_test_net, LEGACY, DM_FLAGS);
+SPL_IMG_TEST(spl_test_net, LEGACY_LZMA, DM_FLAGS);
+SPL_IMG_TEST(spl_test_net, IMX8, DM_FLAGS);
 SPL_IMG_TEST(spl_test_net, FIT_INTERNAL, DM_FLAGS);
 SPL_IMG_TEST(spl_test_net, FIT_EXTERNAL, DM_FLAGS);