]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
tools: image-host: add support for several sub-images
authorPhilippe Reynes <philippe.reynes@softathome.com>
Tue, 24 Nov 2020 13:39:48 +0000 (14:39 +0100)
committerTom Rini <trini@konsulko.com>
Fri, 22 Jan 2021 21:17:52 +0000 (16:17 -0500)
The propoerty sign-images points to images in the configuration
node. But thoses images may references severals "sub-images" (for
example for images loadable). This commit adds the support of
severals sub-images.

Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
tools/image-host.c

index ce829a8ec96f5414513ff2bf8a049a56cb669e8d..33a224129a0d1a8f38d045ad90698ae221c3754e 100644 (file)
@@ -805,25 +805,31 @@ static int fit_config_get_hash_list(void *fit, int conf_noffset,
        image_count = 0;
        for (iname = prop; iname < end; iname += strlen(iname) + 1) {
                int image_noffset;
+               int index, max_index;
 
-               image_noffset = fit_conf_get_prop_node(fit, conf_noffset,
-                                                      iname);
-               if (image_noffset < 0) {
-                       printf("Failed to find image '%s' in  configuration '%s/%s'\n",
-                              iname, conf_name, sig_name);
-                       if (allow_missing)
-                               continue;
+               max_index = fdt_stringlist_count(fit, conf_noffset, iname);
 
-                       return -ENOENT;
-               }
+               for (index = 0; index < max_index; index++) {
+                       image_noffset = fit_conf_get_prop_node_index(fit, conf_noffset,
+                                                                    iname, index);
 
-               ret = fit_config_add_hash(fit, conf_name,
-                                         sig_name, node_inc,
-                                         iname, image_noffset);
-               if (ret < 0)
-                       return ret;
+                       if (image_noffset < 0) {
+                               printf("Failed to find image '%s' in  configuration '%s/%s'\n",
+                                      iname, conf_name, sig_name);
+                               if (allow_missing)
+                                       continue;
 
-               image_count++;
+                               return -ENOENT;
+                       }
+
+                       ret = fit_config_add_hash(fit, conf_name,
+                                                 sig_name, node_inc,
+                                                 iname, image_noffset);
+                       if (ret < 0)
+                               return ret;
+
+                       image_count++;
+               }
        }
 
        if (!image_count) {