From 0694be0b11d117dff10e345dc06403357501b2da Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 18 Mar 2020 11:44:02 -0600 Subject: [PATCH] bootm: Load the correct configuration in fit_check_sign At present bootm_host_load_images() is passed the configuration that has been verified, but ignores it and just uses the default configuration. This may not be the same. Update this function to use the selected configuration. Change-Id: I020baa9321a88348478f1acef8a89e28ec94f3e9 Signed-off-by: Simon Glass Signed-off-by: Md Sadre Alam --- common/bootm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/bootm.c b/common/bootm.c index 0e8c48053c..3526eb6de4 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -914,7 +914,7 @@ void memmove_wd(void *to, void *from, size_t len, ulong chunksz) memmove(to, from, len); } -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; @@ -926,6 +926,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, @@ -970,7 +971,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; }