Patrick Georgi submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Frans Hendriks: Looks good to me, approved
util/ifdtool: Correct region resize handling

When regions are resized they are always aligned to the top of the
region. For the BIOS region this is correct. The other regions however
should be aligned to the bottom of the region.

Update the region handling to only align BIOS region to top of region.

BUG=N/A
TEST=verified image resize

Change-Id: Ied0e763b5335f5f124fc00de38e5db1a4d0f6785
Signed-off-by: Wim Vervoorn <wvervoorn@eltan.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38460
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
---
M util/ifdtool/ifdtool.c
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
index a59f36b..0b6b210 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
@@ -1358,11 +1358,12 @@
if (new->size > current->size) {
/* copy from the end of the current region */
copy_size = current->size;
- offset_new = new->size - current->size;
+ if (i == REGION_BIOS)
+ offset_new = new->size - current->size;
}

- if (new->size < current->size) {
- /* copy to the end of the new region */
+ if ((i == REGION_BIOS) && (new->size < current->size)) {
+ /* copy BIOS region to the end of the new region */
offset_current = current->size - new->size;
}


To view, visit change 38460. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ied0e763b5335f5f124fc00de38e5db1a4d0f6785
Gerrit-Change-Number: 38460
Gerrit-PatchSet: 4
Gerrit-Owner: Wim Vervoorn <wvervoorn@eltan.com>
Gerrit-Reviewer: Frans Hendriks <fhendriks@eltan.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com>
Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer@coreboot.org>
Gerrit-Reviewer: Wim Vervoorn <wvervoorn@eltan.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-MessageType: merged