[coreboot] New patch to review for coreboot: 7ce36a1 cbfstool: Clean up messages
Stefan Reinauer (stefan.reinauer@coreboot.org)
gerrit at coreboot.org
Fri Nov 30 20:22:41 CET 2012
Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1955
-gerrit
commit 7ce36a1fc4b50e6dd6331632ec29ad3fd32acd68
Author: Stefan Reinauer <reinauer at chromium.org>
Date: Fri Nov 30 11:21:05 2012 -0800
cbfstool: Clean up messages
The output of cbfstool is a little inconsistent in some places.
This patch fixes it.
Change-Id: Ieb643cb769ebfa2a307bd286ae2c46f75ac5e1c1
Signed-off-by: Stefan Reinauer <reinauer at google.com>
---
util/cbfstool/cbfstool.c | 8 ++++----
util/cbfstool/common.c | 32 +++++++++++++-------------------
2 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index a09e75b..10b29de 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -247,7 +247,7 @@ static int cbfs_add_flat_binary(void)
}
if (rom_entrypoint == 0) {
- fprintf(stderr, "You need to specify a valid "
+ fprintf(stderr, "E: You need to specify a valid "
"-e/--entry-point.\n");
return 1;
}
@@ -258,7 +258,7 @@ static int cbfs_add_flat_binary(void)
rom = loadrom(cbfs_name);
if (rom == NULL) {
- fprintf(stderr, "Could not load ROM image '%s'.\n",
+ fprintf(stderr, "E: Could not load ROM image '%s'.\n",
cbfs_name);
return 1;
}
@@ -364,12 +364,12 @@ static int cbfs_remove(void)
static int cbfs_create(void)
{
if (rom_size == 0) {
- printf("You need to specify a valid -s/--size.\n");
+ fprintf(stderr, "E: You need to specify a valid -s/--size.\n");
return 1;
}
if (!rom_bootblock) {
- printf("You need to specify -b/--bootblock.\n");
+ fprintf(stderr, "E: You need to specify -b/--bootblock.\n");
return 1;
}
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index d29df60..7e33c97 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -55,7 +55,7 @@ void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
if (!content) {
content = malloc(*romsize_p);
if (!content) {
- printf("Could not get %d bytes for file %s\n",
+ fprintf(stderr, "E: Could not get %d bytes for file %s\n",
*romsize_p, filename);
exit(1);
}
@@ -63,7 +63,7 @@ void *loadfile(const char *filename, uint32_t * romsize_p, void *content,
content -= *romsize_p;
if (!fread(content, *romsize_p, 1, file)) {
- printf("Failed to read %s\n", filename);
+ fprintf(stderr, "E: Failed to read %s\n", filename);
return NULL;
}
fclose(file);
@@ -145,7 +145,7 @@ void recalculate_rom_geometry(void *romarea)
/* Update old headers */
if (master_header->version == VERSION1 &&
ntohl(master_header->architecture) == CBFS_ARCHITECTURE_UNKNOWN) {
- printf("Updating CBFS master header to version 2\n");
+ dprintf("Updating CBFS master header to version 2\n");
master_header->architecture = htonl(CBFS_ARCHITECTURE_X86);
}
@@ -275,7 +275,7 @@ void print_cbfs_directory(const char *filename)
{
printf
("%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\n"
- "Alignment: %d bytes, architecture: %s\n\n",
+ "alignment: %d bytes, architecture: %s\n\n",
basename((char *)filename), romsize / 1024, ntohl(master_header->bootblocksize),
romsize, ntohl(master_header->offset), align, arch_to_string(arch));
printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type");
@@ -303,12 +303,6 @@ void print_cbfs_directory(const char *filename)
int extract_file_from_cbfs(const char *filename, const char *payloadname, const char *outpath)
{
- // Identify the coreboot image.
- printf(
- "%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\nAlignment: %d bytes\n\n",
- basename((char *)filename), romsize / 1024, ntohl(master_header->bootblocksize),
- romsize, ntohl(master_header->offset), align);
-
FILE *outfile = NULL;
uint32_t current = phys_start;
while (current < phys_end) {
@@ -343,13 +337,13 @@ int extract_file_from_cbfs(const char *filename, const char *payloadname, const
outfile = fopen(outpath, "wb");
if (!outfile)
{
- printf("Could not open the file %s for writing. Aborting.\n", outpath);
+ fprintf(stderr, "E: Could not open the file %s for writing.\n", outpath);
return 1;
}
if (ntohl(thisfile->type) != CBFS_COMPONENT_RAW)
{
- printf("Warning: only 'raw' files are safe to extract.\n");
+ fprintf(stderr, "W: Only 'raw' files are safe to extract.\n");
}
fwrite(((char *)thisfile)
@@ -361,7 +355,7 @@ int extract_file_from_cbfs(const char *filename, const char *payloadname, const
// We'll only dump one file.
return 0;
}
- printf("File %s not found.\n", payloadname);
+ fprintf(stderr, "E: File %s not found.\n", payloadname);
return 1;
}
@@ -411,8 +405,8 @@ int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location)
/* CBFS has the constraint that the chain always moves up in memory. so once
we're past the place we seek, we don't need to look any further */
if (current > location) {
- printf
- ("the requested space is not available\n");
+ fprintf
+ (stderr, "E: The requested space is not available\n");
return 1;
}
@@ -438,8 +432,8 @@ int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location)
ALIGN(current + ntohl(thisfile->len) +
ntohl(thisfile->offset), align);
}
- printf("Could not add the file to CBFS, it's probably too big.\n");
- printf("File size: %d bytes (%d KB).\n", contentsize, contentsize/1024);
+ fprintf(stderr, "E: Could not add the file to CBFS, it's probably too big.\n");
+ fprintf(stderr, "E: File size: %d bytes (%d KB).\n", contentsize, contentsize/1024);
return 1;
}
@@ -494,7 +488,7 @@ int remove_file_from_cbfs(const char *filename)
return 0;
}
- printf("CBFS file %s not found.\n", filename);
+ fprintf(stderr, "E: CBFS file %s not found.\n", filename);
return 1;
}
@@ -520,7 +514,7 @@ void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize,
}
void *newdata = malloc(*datasize + headersize);
if (!newdata) {
- printf("Could not get %d bytes for CBFS file.\n", *datasize +
+ fprintf(stderr, "E: Could not get %d bytes for CBFS file.\n", *datasize +
headersize);
exit(1);
}
More information about the coreboot
mailing list