From dcb9abdf4ce76910191c5b3abf56d03ad800e1f7 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 17 Oct 2007 23:55:15 +0000 Subject: [PATCH] Some cosmetic cleanups in the flashrom code and output. Signed-off-by: Uwe Hermann Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2873 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- util/flashrom/82802ab.c | 2 +- util/flashrom/board_enable.c | 10 +++++----- util/flashrom/chipset_enable.c | 4 ++-- util/flashrom/flashrom.c | 10 +++++----- util/flashrom/jedec.c | 4 ++-- util/flashrom/layout.c | 13 ++++++------- util/flashrom/lbtable.c | 16 ++++++++-------- util/flashrom/m29f400bt.c | 4 ++-- util/flashrom/msys_doc.c | 4 ++-- util/flashrom/mx29f002.c | 2 +- util/flashrom/pm49fl004.c | 2 +- util/flashrom/sharplhf00l04.c | 4 ++-- util/flashrom/spi.c | 6 +++--- util/flashrom/sst28sf040.c | 2 +- util/flashrom/sst39sf020.c | 2 +- util/flashrom/sst49lf040.c | 2 +- util/flashrom/sst49lfxxxc.c | 2 +- util/flashrom/sst_fwhub.c | 4 ++-- util/flashrom/udelay.c | 2 +- util/flashrom/w49f002u.c | 2 +- 20 files changed, 48 insertions(+), 49 deletions(-) diff --git a/util/flashrom/82802ab.c b/util/flashrom/82802ab.c index 28e0d7af73..38a5ce295d 100644 --- a/util/flashrom/82802ab.c +++ b/util/flashrom/82802ab.c @@ -172,7 +172,7 @@ int write_82802ab(struct flashchip *flash, uint8_t *buf) printf("ERASE FAILED\n"); return -1; } - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x", i, i * page_size); write_page_82802ab(bios, buf + i * page_size, diff --git a/util/flashrom/board_enable.c b/util/flashrom/board_enable.c index 503f3917f5..78749634ae 100644 --- a/util/flashrom/board_enable.c +++ b/util/flashrom/board_enable.c @@ -161,7 +161,7 @@ static int board_via_epia_m(const char *name) dev = pci_dev_find(0x1106, 0x3177); /* VT8235 ISA bridge */ if (!dev) { - fprintf(stderr, "\nERROR: VT8235 ISA Bridge not found.\n"); + fprintf(stderr, "\nERROR: VT8235 ISA bridge not found.\n"); return -1; } @@ -355,9 +355,9 @@ struct board_pciid_enable { struct board_pciid_enable board_pciid_enables[] = { {0x10de, 0x0360, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - "gigabyte", "m57sli", "GIGABYTE GA-M57SLI", it87xx_probe_spi_flash}, + "gigabyte", "m57sli", "GIGABYTE GA-M57SLI-S4", it87xx_probe_spi_flash}, {0x10de, 0x03e0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - "gigabyte", "m61ps3", "GIGABYTE GA-M61P-S3", it87xx_probe_spi_flash}, + "gigabyte", "m61p", "GIGABYTE GA-M61P-S3", it87xx_probe_spi_flash}, {0x1022, 0x7468, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, "iwill", "dk8_htx", "IWILL DK8-HTX", w83627hf_gpio24_raise_2e}, {0x10de, 0x005e, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -456,12 +456,12 @@ int board_flash_enable(char *vendor, char *part) board = board_match_pci_card_ids(); if (board) { - printf("Found board \"%s\": Enabling flash write... ", + printf("Found board \"%s\": enabling flash write... ", board->name); ret = board->enable(board->name); if (ret) - printf("Failed!\n"); + printf("FAILED!\n"); else printf("OK.\n"); } diff --git a/util/flashrom/chipset_enable.c b/util/flashrom/chipset_enable.c index ab9a92c9c7..631ac29874 100644 --- a/util/flashrom/chipset_enable.c +++ b/util/flashrom/chipset_enable.c @@ -499,12 +499,12 @@ int chipset_flash_enable(void) } if (dev) { - printf("Found chipset \"%s\": Enabling flash write... ", + printf("Found chipset \"%s\", enabling flash write... ", enables[i].name); ret = enables[i].doit(dev, enables[i].name); if (ret) - printf("Failed!\n"); + printf("FAILED!\n"); else printf("OK.\n"); } diff --git a/util/flashrom/flashrom.c b/util/flashrom/flashrom.c index 7587ac79b8..33d3738f2e 100644 --- a/util/flashrom/flashrom.c +++ b/util/flashrom/flashrom.c @@ -143,7 +143,7 @@ struct flashchip *probe_flash(struct flashchip *flash) flash->virtual_memory = bios; if (flash->probe(flash) == 1) { - printf("%s found at physical address: 0x%lx\n", + printf("%s found at physical address 0x%lx.\n", flash->name, flash_baseaddr); return flash; } @@ -161,7 +161,7 @@ int verify_flash(struct flashchip *flash, uint8_t *buf) int total_size = flash->total_size * 1024; volatile uint8_t *bios = flash->virtual_memory; - printf("Verifying flash "); + printf("Verifying flash... "); if (verbose) printf("address: 0x00000000\b\b\b\b\b\b\b\b\b\b"); @@ -174,7 +174,7 @@ int verify_flash(struct flashchip *flash, uint8_t *buf) if (verbose) { printf("0x%08x ", idx); } - printf("- FAILED\n"); + printf("FAILED!\n"); return 1; } @@ -184,7 +184,7 @@ int verify_flash(struct flashchip *flash, uint8_t *buf) if (verbose) printf("\b\b\b\b\b\b\b\b\b\b "); - printf("- VERIFIED \n"); + printf("VERIFIED. \n"); return 0; } @@ -369,7 +369,7 @@ int main(int argc, char *argv[]) exit(1); } - printf("Flash part is %s (%d KB)\n", flash->name, flash->total_size); + printf("Flash part is %s (%d KB).\n", flash->name, flash->total_size); if (!(read_it | write_it | verify_it | erase_it)) { printf("No operations were specified.\n"); diff --git a/util/flashrom/jedec.c b/util/flashrom/jedec.c index 49b1002004..46153dd66c 100644 --- a/util/flashrom/jedec.c +++ b/util/flashrom/jedec.c @@ -281,12 +281,12 @@ int write_jedec(struct flashchip *flash, uint8_t *buf) // dumb check if erase was successful. for (i = 0; i < total_size; i++) { if (bios[i] != (uint8_t) 0xff) { - printf("ERASE FAILED @%d, val %02x\n", i, bios[i]); + printf("ERASE FAILED @%d, val %02x!\n", i, bios[i]); return -1; } } - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x", i, i * page_size); write_page_write_jedec(bios, buf + i * page_size, diff --git a/util/flashrom/layout.c b/util/flashrom/layout.c index 6f87dd6fe1..cbd8791cc5 100644 --- a/util/flashrom/layout.c +++ b/util/flashrom/layout.c @@ -47,14 +47,14 @@ int show_id(uint8_t *bios, int size) } 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 @@ -63,7 +63,7 @@ int show_id(uint8_t *bios, int size) if (!lb_vendor || !lb_part) { printf("Note: If the following flash access fails, " - "you might need to specify -m :\n"); + "you might need to specify -m :.\n"); return 0; } @@ -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; } @@ -154,8 +154,7 @@ int find_romentry(char *name) return i; } } - printf("not found.\n"); - // Not found. Error. + printf("not found.\n"); // Not found. Error. return -1; } diff --git a/util/flashrom/lbtable.c b/util/flashrom/lbtable.c index a95f9204d5..a56afc7640 100644 --- a/util/flashrom/lbtable.c +++ b/util/flashrom/lbtable.c @@ -105,26 +105,26 @@ static struct lb_header *find_lb_table(void *base, unsigned long start, printf_debug("Found canidate at: %08lx-%08lx\n", addr, addr + head->table_bytes); if (head->header_bytes != sizeof(*head)) { - fprintf(stderr, "Header bytes of %d are incorrect\n", + fprintf(stderr, "Header bytes of %d are incorrect.\n", head->header_bytes); continue; } if (count_lb_records(head) != head->table_entries) { - fprintf(stderr, "bad record count: %d\n", + fprintf(stderr, "Bad record count: %d.\n", head->table_entries); continue; } if (compute_checksum((uint8_t *) head, sizeof(*head)) != 0) { - fprintf(stderr, "bad header checksum\n"); + fprintf(stderr, "Bad header checksum.\n"); continue; } if (compute_checksum(recs, head->table_bytes) != head->table_checksum) { - fprintf(stderr, "bad table checksum: %04x\n", + fprintf(stderr, "Bad table checksum: %04x.\n", head->table_checksum); continue; } - fprintf(stdout, "Found LinuxBIOS table at: %08lx\n", addr); + fprintf(stdout, "Found LinuxBIOS table at 0x%08lx.\n", addr); return head; }; @@ -140,7 +140,7 @@ static void find_mainboard(struct lb_record *ptr, unsigned long addr) rec = (struct lb_mainboard *)ptr; max_size = rec->size - sizeof(*rec); - printf("vendor id: %.*s part id: %.*s\n", + printf("Vendor ID: %.*s, part ID: %.*s\n", max_size - rec->vendor_idx, rec->strings + rec->vendor_idx, max_size - rec->part_number_idx, @@ -151,7 +151,7 @@ static void find_mainboard(struct lb_record *ptr, unsigned long addr) rec->strings + rec->part_number_idx); if (lb_part) { - printf("overwritten by command line, vendor id: %s part id: %s\n", lb_vendor, lb_part); + printf("Overwritten by command line, vendor ID: %s, part ID: %s.\n", lb_vendor, lb_part); } else { lb_part = strdup(part); lb_vendor = strdup(vendor); @@ -201,7 +201,7 @@ int linuxbios_init(void) if (lb_table) { unsigned long addr; addr = ((char *)lb_table) - ((char *)low_1MB); - printf_debug("lb_table found at address %p\n", lb_table); + printf_debug("LinuxBIOS table found at %p.\n", lb_table); rec = (struct lb_record *)(((char *)lb_table) + lb_table->header_bytes); last = (struct lb_record *)(((char *)rec) + lb_table->table_bytes); printf_debug("LinuxBIOS header(%d) checksum: %04x table(%d) checksum: %04x entries: %d\n", diff --git a/util/flashrom/m29f400bt.c b/util/flashrom/m29f400bt.c index 962d88c3f5..40b219cadc 100644 --- a/util/flashrom/m29f400bt.c +++ b/util/flashrom/m29f400bt.c @@ -124,7 +124,7 @@ int write_m29f400bt(struct flashchip *flash, uint8_t *buf) volatile uint8_t *bios = flash->virtual_memory; //erase_m29f400bt (flash); - printf("Programming Page:\n "); + printf("Programming page:\n "); /********************************* *Pages for M29F400BT: * 16 0x7c000 0x7ffff TOP @@ -175,7 +175,7 @@ int write_linuxbios_m29f400bt(struct flashchip *flash, uint8_t *buf) { volatile uint8_t *bios = flash->virtual_memory; - printf("Programming Page:\n "); + printf("Programming page:\n "); /********************************* *Pages for M29F400BT: * 16 0x7c000 0x7ffff TOP diff --git a/util/flashrom/msys_doc.c b/util/flashrom/msys_doc.c index 3b4064d427..1d80f46718 100644 --- a/util/flashrom/msys_doc.c +++ b/util/flashrom/msys_doc.c @@ -169,10 +169,10 @@ int write_md2802(struct flashchip *flash, uint8_t *buf) return (1); erase_md2802(flash); if (*bios != (uint8_t) 0xff) { - printf("ERASE FAILED\n"); + printf("ERASE FAILED!\n"); return -1; } - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x", i, i * page_size); //write_page_md2802(bios, buf + i * page_size, bios + i * page_size, page_size); diff --git a/util/flashrom/mx29f002.c b/util/flashrom/mx29f002.c index 802e54f5e2..7de4502440 100644 --- a/util/flashrom/mx29f002.c +++ b/util/flashrom/mx29f002.c @@ -88,7 +88,7 @@ int write_29f002(struct flashchip *flash, uint8_t *buf) erase_29f002(flash); //*bios = 0xF0; #if 1 - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size; i++) { /* write to the sector */ if ((i & 0xfff) == 0) diff --git a/util/flashrom/pm49fl004.c b/util/flashrom/pm49fl004.c index 1e39c41137..e5fcd66675 100644 --- a/util/flashrom/pm49fl004.c +++ b/util/flashrom/pm49fl004.c @@ -30,7 +30,7 @@ int write_49fl004(struct flashchip *flash, uint8_t *buf) int page_size = flash->page_size; volatile uint8_t *bios = flash->virtual_memory; - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { if ((i >= exclude_start_page) && (i < exclude_end_page)) continue; diff --git a/util/flashrom/sharplhf00l04.c b/util/flashrom/sharplhf00l04.c index 3bfcb70387..da7dc3f214 100644 --- a/util/flashrom/sharplhf00l04.c +++ b/util/flashrom/sharplhf00l04.c @@ -164,10 +164,10 @@ int write_lhf00l04(struct flashchip *flash, uint8_t *buf) erase_lhf00l04(flash); if (*bios != 0xff) { - printf("ERASE FAILED\n"); + printf("ERASE FAILED!\n"); return -1; } - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x", i, i * page_size); write_page_lhf00l04(bios, buf + i * page_size, diff --git a/util/flashrom/spi.c b/util/flashrom/spi.c index 8a6a61c6c3..5dae5be731 100644 --- a/util/flashrom/spi.c +++ b/util/flashrom/spi.c @@ -123,7 +123,7 @@ static int it8716f_spi_command(uint16_t port, unsigned char writecnt, unsigned c busy = inb(port) & 0x80; } while (busy); if (readcnt > 3) { - printf("%s called with unsupported readcnt %i\n", + printf("%s called with unsupported readcnt %i.\n", __FUNCTION__, readcnt); return 1; } @@ -153,7 +153,7 @@ static int it8716f_spi_command(uint16_t port, unsigned char writecnt, unsigned c writeenc = 0x3; break; default: - printf("%s called with unsupported writecnt %i\n", + printf("%s called with unsupported writecnt %i.\n", __FUNCTION__, writecnt); return 1; } @@ -184,7 +184,7 @@ static int generic_spi_rdid(unsigned char *readarr) if (generic_spi_command(JEDEC_RDID_OUTSIZE, JEDEC_RDID_INSIZE, cmd, readarr)) return 1; - printf("RDID returned %02x %02x %02x\n", readarr[0], readarr[1], readarr[2]); + printf("RDID returned %02x %02x %02x.\n", readarr[0], readarr[1], readarr[2]); return 0; } diff --git a/util/flashrom/sst28sf040.c b/util/flashrom/sst28sf040.c index 90bc177626..85fb9d0966 100644 --- a/util/flashrom/sst28sf040.c +++ b/util/flashrom/sst28sf040.c @@ -143,7 +143,7 @@ int write_28sf040(struct flashchip *flash, uint8_t *buf) unprotect_28sf040(bios); - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { /* erase the page before programming */ erase_sector_28sf040(bios, i * page_size); diff --git a/util/flashrom/sst39sf020.c b/util/flashrom/sst39sf020.c index cfd4826d81..c4fd9570c1 100644 --- a/util/flashrom/sst39sf020.c +++ b/util/flashrom/sst39sf020.c @@ -46,7 +46,7 @@ int write_39sf020(struct flashchip *flash, uint8_t *buf) erase_chip_jedec(flash); - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { /* write to the sector */ printf("%04d at address: 0x%08x", i, i * page_size); diff --git a/util/flashrom/sst49lf040.c b/util/flashrom/sst49lf040.c index e2d0e793c5..5528b527dc 100644 --- a/util/flashrom/sst49lf040.c +++ b/util/flashrom/sst49lf040.c @@ -44,7 +44,7 @@ int write_49lf040(struct flashchip *flash, uint8_t *buf) int page_size = flash->page_size; volatile uint8_t *bios = flash->virtual_memory; - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { /* erase the page before programming * Chip erase only works in parallel programming mode diff --git a/util/flashrom/sst49lfxxxc.c b/util/flashrom/sst49lfxxxc.c index a6c0105761..b6693efb11 100644 --- a/util/flashrom/sst49lfxxxc.c +++ b/util/flashrom/sst49lfxxxc.c @@ -170,7 +170,7 @@ int write_49lfxxxc(struct flashchip *flash, uint8_t *buf) volatile uint8_t *bios = flash->virtual_memory; write_lockbits_49lfxxxc(flash->virtual_registers, total_size, 0); - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { /* erase the page before programming */ erase_sector_49lfxxxc(bios, i * page_size); diff --git a/util/flashrom/sst_fwhub.c b/util/flashrom/sst_fwhub.c index ae9852132e..0f5dd1586b 100644 --- a/util/flashrom/sst_fwhub.c +++ b/util/flashrom/sst_fwhub.c @@ -83,12 +83,12 @@ int write_sst_fwhub(struct flashchip *flash, uint8_t *buf) // dumb check if erase was successful. for (i = 0; i < total_size; i++) { if (bios[i] != 0xff) { - printf("ERASE FAILED\n"); + printf("ERASE FAILED!\n"); return -1; } } - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { printf("%04d at address: 0x%08x", i, i * page_size); write_sector_jedec(bios, buf + i * page_size, diff --git a/util/flashrom/udelay.c b/util/flashrom/udelay.c index 2026d3e241..f7257c9637 100644 --- a/util/flashrom/udelay.c +++ b/util/flashrom/udelay.c @@ -56,5 +56,5 @@ void myusec_calibrate_delay() micro = count / timeusec; printf_debug("%ldM loops per second. ", (unsigned long)micro); - printf("ok\n"); + printf("OK.\n"); } diff --git a/util/flashrom/w49f002u.c b/util/flashrom/w49f002u.c index 246bae51b1..b7fca6b73a 100644 --- a/util/flashrom/w49f002u.c +++ b/util/flashrom/w49f002u.c @@ -30,7 +30,7 @@ int write_49f002(struct flashchip *flash, uint8_t *buf) erase_chip_jedec(flash); - printf("Programming Page: "); + printf("Programming page: "); for (i = 0; i < total_size / page_size; i++) { /* write to the sector */ printf("%04d at address: 0x%08x ", i, i * page_size);