spl: fit: drop the 'standalone' load attempt

The 'standalone =' config property has been deprecated for ~5 years [1],
with the loud warn about the deprecation lasting much more than the
foreseen couple of releases.

Remove the attempt to load the primary image through this property to
save some boot time and code complexity.

[1] https://lore.kernel.org/u-boot/20210401182531.2147653-5-mr.nuke.me@gmail.com/

Signed-off-by: Francesco Valla <francesco@valla.it>

diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index 1f3f7e549502cb6ba53943de1316a1d2a25d5e49..e1c8b1c9b6984ed81947e037a724d168c26b5fa1 100644 (file)
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -959,18 +959,9 @@ int spl_load_fit_image(struct spl_image_info *spl_image,
        images.verify = 1;
 #endif
        ret = fit_image_load(&images, virt_to_phys((void *)header),
-                            NULL, &fit_uname_config,
-                            IH_ARCH_DEFAULT, IH_TYPE_STANDALONE, -1,
-                            FIT_LOAD_OPTIONAL, &fw_data, &fw_len);
-       if (ret >= 0) {
-               printf("DEPRECATED: 'standalone = ' property.");
-               printf("Please use either 'firmware =' or 'kernel ='\n");
-       } else {
-               ret = fit_image_load(&images, virt_to_phys((void *)header),
-                                    NULL, &fit_uname_config, IH_ARCH_DEFAULT,
-                                    IH_TYPE_FIRMWARE, -1, FIT_LOAD_OPTIONAL,
-                                    &fw_data, &fw_len);
-       }
+                            NULL, &fit_uname_config, IH_ARCH_DEFAULT,
+                            IH_TYPE_FIRMWARE, -1, FIT_LOAD_OPTIONAL,
+                            &fw_data, &fw_len);
 
        if (ret < 0) {
                ret = fit_image_load(&images, virt_to_phys((void *)header),