From 17d00abf0a1977fc4b10f64296671af7f903c6bc Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 10 Oct 2007 16:31:30 +0000 Subject: Cosmetic changes to make the flashrom output more consistent Corresponding to flashrom svn r142 and coreboot v2 svn r2846. Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann --- layout.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'layout.c') diff --git a/layout.c b/layout.c index 6f87dd6..36d5da7 100644 --- a/layout.c +++ b/layout.c @@ -40,21 +40,21 @@ int show_id(uint8_t *bios, int size) } if ((*walk) == 0 || ((*walk) & 0x3ff) != 0) { - printf("Flash image seems to be a legacy BIOS. Disabling checks.\n"); + printf("Flash image seems to be a legacy BIOS - disabling checks\n"); mainboard_vendor = def_name; mainboard_part = def_name; return 0; } printf_debug("LinuxBIOS last image size " - "(not rom size) is %d bytes.\n", *walk); + "(not ROM size) is %d bytes\n", *walk); walk--; mainboard_part = strdup((const char *)(bios + size - *walk)); walk--; mainboard_vendor = strdup((const char *)(bios + size - *walk)); - printf_debug("MANUFACTURER: %s\n", mainboard_vendor); - printf_debug("MAINBOARD ID: %s\n", mainboard_part); + printf_debug("Manufacturer: %s\n", mainboard_vendor); + printf_debug("Mainboard ID: %s\n", mainboard_part); /* * If lb_vendor is not set, the linuxbios table was @@ -74,18 +74,18 @@ int show_id(uint8_t *bios, int size) if (!strcasecmp(mainboard_vendor, lb_vendor) && !strcasecmp(mainboard_part, lb_part)) { printf_debug("This firmware image matches " - "this motherboard.\n"); + "this motherboard\n"); } else { if (force) { printf("WARNING: This firmware image does not " - "seem to fit to this machine - forcing it.\n"); + "seem to fit to this machine - forcing it\n"); } else { printf("ERROR: Your firmware image (%s:%s) does not " "appear to\n be correct for the detected " "mainboard (%s:%s)\n\nOverride with --force if you " "are absolutely sure that you\nare using a correct " "image for this mainboard or override\nthe detected " - "values with --mainboard :.\n\n", + "values with --mainboard :\n\n", mainboard_vendor, mainboard_part, lb_vendor, lb_part); exit(1); @@ -104,7 +104,7 @@ int read_romlayout(char *name) romlayout = fopen(name, "r"); if (!romlayout) { - fprintf(stderr, "ERROR: Could not open rom layout (%s).\n", + fprintf(stderr, "ERROR: Could not open ROM layout (%s)\n", name); return -1; } @@ -150,11 +150,11 @@ int find_romentry(char *name) for (i = 0; i < romimages; i++) { if (!strcmp(rom_entries[i].name, name)) { rom_entries[i].included = 1; - printf("found.\n"); + printf("found\n"); return i; } } - printf("not found.\n"); + printf("not found\n"); // Not found. Error. return -1; -- cgit v1.1