GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cbfstool: improve error messages 

If a file can't be added by cbfstool, print the type and name of the file
in the error message.

Change-Id: I369d6f5be09ec53ee5beea2cfea65a80407f0ba3
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/271
Tested-by: build bot (Jenkins)
Reviewed-by: Marc Jones <marcj303@gmail.com>
This commit is contained in:
Stefan Reinauer 2011-10-14 12:44:14 -07:00 committed by Stefan Reinauer
parent a9a8b80191
commit fbadc499a6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util/cbfstool/cbfstool.c
View File

@ -81,8 +81,10 @@ static int cbfs_add(int argc, char **argv)
base = strtoul(argv[6], NULL, 0); base = strtoul(argv[6], NULL, 0);
} }
cbfsfile = create_cbfs_file(cbfsname, filedata, &filesize, type, &base); cbfsfile = create_cbfs_file(cbfsname, filedata, &filesize, type, &base);
if (add_file_to_cbfs(cbfsfile, filesize, base)) if (add_file_to_cbfs(cbfsfile, filesize, base)) {
printf("Adding file '%s' failed.\n", filename);
return 1; return 1;
}
if (writerom(romname, rom, romsize)) if (writerom(romname, rom, romsize))
return 1; return 1;
return 0; return 0;
@ -130,8 +132,10 @@ static int cbfs_add_payload(int argc, char **argv)
cbfsfile = cbfsfile =
create_cbfs_file(cbfsname, payload, &filesize, create_cbfs_file(cbfsname, payload, &filesize,
CBFS_COMPONENT_PAYLOAD, &base); CBFS_COMPONENT_PAYLOAD, &base);
if (add_file_to_cbfs(cbfsfile, filesize, base)) if (add_file_to_cbfs(cbfsfile, filesize, base)) {
printf("Adding payload '%s' failed.\n", filename);
return 1; return 1;
}
if (writerom(romname, rom, romsize)) if (writerom(romname, rom, romsize))
return 1; return 1;
return 0; return 0;
@ -180,8 +184,10 @@ static int cbfs_add_stage(int argc, char **argv)
create_cbfs_file(cbfsname, stage, &filesize, create_cbfs_file(cbfsname, stage, &filesize,
CBFS_COMPONENT_STAGE, &base); CBFS_COMPONENT_STAGE, &base);
if (add_file_to_cbfs(cbfsfile, filesize, base)) if (add_file_to_cbfs(cbfsfile, filesize, base)) {
printf("Adding stage '%s' failed.\n", filename);
return 1; return 1;
}
if (writerom(romname, rom, romsize)) if (writerom(romname, rom, romsize))
return 1; return 1;
return 0; return 0;