[coreboot-gerrit] New patch to review for coreboot: cbfstool: have update-fit always work from CBFS

Patrick Georgi (pgeorgi@google.com) gerrit at coreboot.org
Sat Sep 19 14:05:39 CET 2015


Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11691

-gerrit

commit 4c2b6cb90f45411e5af568bb9d7b6ba5d445492c
Author: Patrick Georgi <pgeorgi at chromium.org>
Date:   Sat Sep 19 14:04:45 2015 +0200

    cbfstool: have update-fit always work from CBFS
    
    On x86, the bootblock can (and will) become part of the regular file
    system, so there's no distinct fixed-size region for the bootblock
    there.
    
    Change-Id: Ie139215b73e01027bc0586701361e9a0afa9150e
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
---
 util/cbfstool/cbfstool.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 2bb8edc..4750666 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -835,16 +835,9 @@ static int cbfs_update_fit(void)
 		return 1;
 	}
 
-	// Decide which region to read/write the FIT table from/to.
 	struct buffer bootblock;
-	if (partitioned_file_is_partitioned(param.image_file)) {
-		if (!partitioned_file_read_region(&bootblock, param.image_file,
-							SECTION_WITH_FIT_TABLE))
-			return 1;
-	} else {
-		// In legacy images, the bootblock is part of the CBFS.
-		buffer_clone(&bootblock, param.image_region);
-	}
+	// The bootblock is part of the CBFS on x86
+	buffer_clone(&bootblock, param.image_region);
 
 	struct cbfs_image image;
 	if (cbfs_image_from_buffer(&image, param.image_region,



More information about the coreboot-gerrit mailing list