[PATCH] Revert "tools: mkimage: detect overlapping load regions in FIT configurations"

[Marek Vasut]

This reverts commit 588094f2c8ec9a4f7d2dcda11ffae8db8462149c.

This introduces warnings on valid fitImages which do not set load
address for fdt-1 DT node. This is valid, because DT can be loaded
to suitable location as determined by the fitImage loader.

Warning: not able to get `load` of node 'fdt-1'

Furthermore, do not add C++ style comments into C code.

Either send a fix or apply this revert.

Signed-off-by: Marek Vasut <marek.vasut+renesas at mailbox.org>
---
Cc: "Carlos López" <carlos.lopezr4096 at gmail.com>
Cc: Aristo Chen <jj251510319013 at gmail.com>
Cc: Ilias Apalodimas <ilias.apalodimas at linaro.org>
Cc: Marek Vasut <marek.vasut+renesas at mailbox.org>
Cc: Rasmus Villemoes <ravi at prevas.dk>
Cc: Simon Glass <sjg at chromium.org>
Cc: Tom Rini <trini at konsulko.com>
Cc: u-boot at lists.denx.de
---
 tools/fit_image.c | 90 +----------------------------------------------
 tools/mkimage.c   |  3 +-
 2 files changed, 2 insertions(+), 91 deletions(-)

diff --git a/tools/fit_image.c b/tools/fit_image.c
index 12f4cdb2875..10849733816 100644
--- a/tools/fit_image.c
+++ b/tools/fit_image.c
@@ -22,20 +22,6 @@
 #include <version.h>
 #include <u-boot/crc.h>
 
-struct fit_region {
-	ulong load;
-	ulong size;
-	const char *name;
-};
-
-static int regions_overlap(const struct fit_region *a, const struct fit_region *b)
-{
-	ulong a_end = a->load + a->size;
-	ulong b_end = b->load + b->size;
-
-	return !(a_end <= b->load || b_end <= a->load);
-}
-
 static struct legacy_img_hdr header;
 
 static int fit_estimate_hash_sig_size(struct image_tool_params *params, const char *fname)
@@ -837,12 +823,9 @@ static int fit_import_data(struct image_tool_params *params, const char *fname)
 	}
 
 	fdt_for_each_subnode(node, fdt, confs) {
-		struct fit_region *regions = NULL;
-		unsigned int img_count = 0;
-		unsigned int regions_allocated = 0;
 		const char *conf_name = fdt_get_name(fdt, node, NULL);
 
-		for (unsigned int i = 0; i < ARRAY_SIZE(props); i++) {
+		for (int i = 0; i < ARRAY_SIZE(props); i++) {
 			int count = fdt_stringlist_count(fdt, node, props[i]);
 
 			if (count < 0)
@@ -863,79 +846,8 @@ static int fit_import_data(struct image_tool_params *params, const char *fname)
 					ret = FDT_ERR_NOTFOUND;
 					goto err_munmap;
 				}
-
-				ulong img_load = 0;
-				int img_size = 0;
-
-				if (fit_image_get_load(fdt, img, &img_load)) {
-					fprintf(stderr,
-						"Warning: not able to get `load` of node '%s'\n",
-						img_name);
-					// Skip checking the components that do not have a
-					// definition for `load`
-					continue;
-				}
-				const char *img_data = fdt_getprop(fdt, img,
-								   FIT_DATA_PROP,
-								   &img_size);
-
-				if (!img_data || !img_size)
-					continue;
-
-				// Check if we've already added this image to avoid duplicates
-				for (unsigned int k = 0; k < img_count; k++) {
-					if (!strcmp(regions[k].name, img_name))
-						goto next_node;
-				}
-
-				// Expand regions array if needed
-				if (img_count >= regions_allocated) {
-					unsigned int new_size = regions_allocated ?
-								regions_allocated * 2 : 8;
-					struct fit_region *new_regions = realloc(regions,
-							new_size * sizeof(struct fit_region));
-					if (!new_regions) {
-						fprintf(stderr,
-							"Failed to allocate memory for regions in config %s\n",
-							fdt_get_name(fdt, node, NULL));
-						free(regions);
-						ret = -ENOMEM;
-						goto err_munmap;
-					}
-					regions = new_regions;
-					regions_allocated = new_size;
-				}
-
-				regions[img_count].load = img_load;
-				regions[img_count].size = img_size;
-				regions[img_count].name = img_name;
-				img_count++;
-next_node:;
-			}
-		}
-
-		// Check for overlap within this config only
-		for (unsigned int i = 0; i < img_count; i++) {
-			for (unsigned int j = i + 1; j < img_count; j++) {
-				if (regions_overlap(&regions[i], &regions[j])) {
-					fprintf(stderr,
-						"[Config: %s] Error: Overlap detected:\n"
-						"  - %s: [0x%lx - 0x%lx]\n"
-						"  - %s: [0x%lx - 0x%lx]\n",
-						fdt_get_name(fdt, node, NULL),
-						regions[i].name, regions[i].load,
-						regions[i].load + regions[i].size,
-						regions[j].name, regions[j].load,
-						regions[j].load + regions[j].size);
-					ret = FDT_ERR_BADSTRUCTURE;
-					free(regions);
-					goto err_munmap;
-				}
 			}
 		}
-
-		// Clean up allocated memory for this configuration
-		free(regions);
 	}
 
 	munmap(old_fdt, sbuf.st_size);
diff --git a/tools/mkimage.c b/tools/mkimage.c
index e96fb7e42db..12183270776 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -533,8 +533,7 @@ int main(int argc, char **argv)
 			retval = tparams->fflag_handle(&params);
 
 		if (retval != EXIT_SUCCESS) {
-			if (retval == FDT_ERR_NOTFOUND ||
-			    retval == FDT_ERR_BADSTRUCTURE) {
+			if (retval == FDT_ERR_NOTFOUND) {
 				// Already printed error, exit cleanly
 				exit(EXIT_FAILURE);
 			}
-- 
2.51.0