[coreboot-gerrit] Change in coreboot[master]: util/ifdtool: Support modification of single Flash Descriptor

[Marcello Sylvester Bauer (Code Review)]

Marcello Sylvester Bauer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38711 )

Change subject: util/ifdtool: Support modification of single Flash Descriptor
......................................................................

util/ifdtool: Support modification of single Flash Descriptor

Add the capability to update the Flash Descriptor module directly
instead of raising a Segmentation Fault.
In this way it will be possible to add a Kconfig options to modify the
ifd descriptor at build-time.

Change-Id: Id3db09291af2bd2e759c283e316afd5da1fb4ca7
Signed-off-by: Marcello Sylvester Bauer 
---
M util/ifdtool/ifdtool.c
1 file changed, 23 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/11/38711/1

diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
index 0b6b210..fa2a564 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
@@ -1263,6 +1263,7 @@
    region_t new_regions[MAX_REGIONS];
    int new_extent = 0;
    char *new_image;
+	bool descriptor_only;

/* load current descriptor map and regions */
    frba_t *frba = find_frba(image, size);
@@ -1336,8 +1337,17 @@
    		new_extent = new_regions[i].limit;
    }

+	/* check if the image is actually a Flash Descriptor module */
+	descriptor_only = false;
+	/* compare image size to descriptor */
+	if (size == new_regions[0].size) {
+		printf("The image is a single Flash Descriptor module:\n");
+		printf("    Only the module will be modified\n");
+		descriptor_only = true;
+	}
+
    new_extent = next_pow2(new_extent - 1);
-	if (new_extent != size) {
+	if (!descriptor_only && new_extent != size) {
    	printf("The image has changed in size.\n");
    	printf("The old image is %d bytes.\n", size);
    	printf("The new image is %d bytes.\n", new_extent);
@@ -1367,6 +1377,12 @@
    		offset_current = current->size - new->size;
    	}

+		if (size < current->base + offset_current + copy_size) {
+			printf("Skip Descriptor %d (%s) (region missing in the old image)\n", i,
+				region_name(i));
+			continue;
+		};
+
    	printf("Copy Descriptor %d (%s) (%d bytes)\n", i,
    			region_name(i), copy_size);
    	printf("   from %08x+%08x:%08x (%10d)\n", current->base,
@@ -1384,10 +1400,15 @@
    if (!frba)
    	exit(EXIT_FAILURE);

+	printf("Modify Flash Descriptor regions\n");
    for (i = 1; i < max_regions; i++)
    	set_region(frba, i, &new_regions[i]);

-	write_image(filename, new_image, new_extent);
+	if (descriptor_only) {
+		write_image(filename, new_image, size);
+	} else {
+		write_image(filename, new_image, new_extent);
+	};
    free(new_image);
 }