sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cbfstool: Use buffer over offset/size pair for cbfs_copy_instance

Browse Source 
This allows adding support for FMAP based cbfstool copy more easily.

BUG=chromium:445938

Change-Id: I72e7bc4da7d27853e324400f76f86136e3d8726e
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/12787
Tested-by: build bot (Jenkins)
This commit is contained in:
Patrick Georgi
2015-11-20 19:22:50 +01:00
committed by Aaron Durbin
parent cbb6c75061
commit 214e4af102
3 changed files with 34 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
util/cbfstool/cbfstool.c
View File

@@ -917,27 +917,34 @@ static int cbfs_update_fit(void)
static int cbfs_copy(void)
{
if (!param.copyoffset_assigned) {
ERROR("You need to specify -D/--copy-offset.\n");
return 1;
}
/* always a valid source region */
struct cbfs_image src_image;
if (!param.size) {
ERROR("You need to specify -s/--size.\n");
return 1;
}
struct cbfs_image image;
if (cbfs_image_from_buffer(&image, param.image_region,
if (cbfs_image_from_buffer(&src_image, param.image_region,
param.headeroffset))
return 1;
if (!cbfs_is_legacy_cbfs(&image)) {
struct buffer dst_buffer;
if (cbfs_is_legacy_cbfs(&src_image)) {
if (!param.copyoffset_assigned) {
ERROR("You need to specify -D/--copy-offset.\n");
return 1;
}
if (!param.size) {
ERROR("You need to specify -s/--size.\n");
return 1;
}
buffer_splice(&dst_buffer, param.image_region,
param.copyoffset, param.size);
} else {
ERROR("This operation is only valid on legacy images having CBFS master headers\n");
return 1;
}
return cbfs_copy_instance(&image, param.copyoffset, param.size);
return cbfs_copy_instance(&src_image, &dst_buffer);
}
static const struct command commands[] = {