Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / common / bootm.c

diff --git a/common/bootm.c b/common/bootm.c
index 02295daf79f1f6452a6e2120be64e8955b22c07c..db4362a64307889307af364d0bb8ab5e5d8ac1a7 100644 (file)
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -7,9 +7,11 @@
 #ifndef USE_HOSTCC
 #include <common.h>
 #include <bootstage.h>
+#include <cpu_func.h>
 #include <env.h>
 #include <errno.h>
 #include <fdt_support.h>
+#include <irq_func.h>
 #include <lmb.h>
 #include <malloc.h>
 #include <mapmem.h>
@@ -817,7 +819,8 @@ void __weak switch_to_non_secure_mode(void)
 #else /* USE_HOSTCC */
 
 #if defined(CONFIG_FIT_SIGNATURE)
-static int bootm_host_load_image(const void *fit, int req_image_type)
+static int bootm_host_load_image(const void *fit, int req_image_type,
+                                int cfg_noffset)
 {
        const char *fit_uname_config = NULL;
        ulong data, len;
@@ -829,6 +832,7 @@ static int bootm_host_load_image(const void *fit, int req_image_type)
        void *load_buf;
        int ret;
 
+       fit_uname_config = fdt_get_name(fit, cfg_noffset, NULL);
        memset(&images, '\0', sizeof(images));
        images.verify = 1;
        noffset = fit_image_load(&images, (ulong)fit,
@@ -876,7 +880,7 @@ int bootm_host_load_images(const void *fit, int cfg_noffset)
        for (i = 0; i < ARRAY_SIZE(image_types); i++) {
                int ret;
 
-               ret = bootm_host_load_image(fit, image_types[i]);
+               ret = bootm_host_load_image(fit, image_types[i], cfg_noffset);
                if (!err && ret && ret != -ENOENT)
                        err = ret;
        }