summaryrefslogtreecommitdiff
path: root/util/cbfstool/cbfstool.c
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@chromium.org>2015-09-19 14:04:45 +0200
committerPatrick Georgi <pgeorgi@google.com>2015-09-28 10:13:22 +0000
commit6dd99fcafe83fed2632a90821de6373516c14a0c (patch)
tree4f2b428cc1448915c37fff964ac3783b04638842 /util/cbfstool/cbfstool.c
parent9cc8e92b6c2445ef7664ba20d9cf94b49fdbb972 (diff)
downloadcoreboot-6dd99fcafe83fed2632a90821de6373516c14a0c.tar.xz
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@chromium.org> Reviewed-on: http://review.coreboot.org/11691 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'util/cbfstool/cbfstool.c')
-rw-r--r--util/cbfstool/cbfstool.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 5194061f3c..bf589a5a27 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -838,16 +838,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,