From 35c7527eb9884e2a1c6911cf524639c6e5b91c98 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Wed, 6 Mar 2019 15:52:27 +0200 Subject: [PATCH] fit: load all fragments from the extra configurations Currently only the first fdt is loaded from the extra configuration of FIT image. If the configuration have multiple fdt, load them all as well. Signed-off-by: Peter Ujfalusi Reviewed-by: Lokesh Vutla --- common/image-fit.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/common/image-fit.c b/common/image-fit.c index ac901e131c..a74b44f298 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -2118,6 +2118,18 @@ int boot_get_fdt_fit(bootm_headers_t *images, ulong addr, if (next_config) *next_config++ = '\0'; uname = NULL; + + /* + * fit_image_load() would load the first FDT from the + * extra config only when uconfig is specified. + * Check if the extra config contains multiple FDTs and + * if so, load them. + */ + cfg_noffset = fit_conf_get_node(fit, uconfig); + + i = 0; + count = fit_conf_get_prop_node_count(fit, cfg_noffset, + FIT_FDT_PROP); } debug("%d: using uname=%s uconfig=%s\n", i, uname, uconfig); -- 2.25.1