A bunch of cosmetic improvements (trivial).
- Fix typos and inconsistencies. - Drop duplicate line which tells us the chip name twice. - Also print the chip vendor, not only the name. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Uwe Hermann <uwe@hermann-uwe.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3348 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
parent
1a02c8eeed
commit
6eb5012a8c
|
@ -701,7 +701,7 @@ int board_flash_enable(const char *vendor, const 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);
|
||||
|
|
|
@ -154,7 +154,7 @@ static int enable_flash_ich(struct pci_dev *dev, const char *name,
|
|||
*/
|
||||
old = pci_read_byte(dev, bios_cntl);
|
||||
|
||||
printf_debug("BIOS Lock Enable: %sabled, ",
|
||||
printf_debug("\nBIOS Lock Enable: %sabled, ",
|
||||
(old & (1 << 1)) ? "en" : "dis");
|
||||
printf_debug("BIOS Write Enable: %sabled, ",
|
||||
(old & (1 << 0)) ? "en" : "dis");
|
||||
|
|
|
@ -151,8 +151,9 @@ 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",
|
||||
flash->name, flash_baseaddr);
|
||||
printf("Found chip \"%s %s\" (%d KB) at physical address 0x%lx.\n",
|
||||
flash->vendor, flash->name, flash->total_size,
|
||||
flash_baseaddr);
|
||||
return flash;
|
||||
}
|
||||
munmap((void *)bios, size);
|
||||
|
@ -360,7 +361,7 @@ int main(int argc, char *argv[])
|
|||
}
|
||||
|
||||
if (read_it && write_it) {
|
||||
printf("-r and -w are mutually exclusive\n");
|
||||
printf("Error: -r and -w are mutually exclusive.\n");
|
||||
usage(argv[0]);
|
||||
}
|
||||
|
||||
|
@ -432,7 +433,6 @@ int main(int argc, char *argv[])
|
|||
|
||||
flash = flashes[0];
|
||||
|
||||
printf("Flash part is %s (%d KB).\n", flash->name, flash->total_size);
|
||||
if (TEST_OK_MASK != (flash->tested & TEST_OK_MASK)) {
|
||||
printf("===\n");
|
||||
if (flash->tested & TEST_BAD_MASK) {
|
||||
|
@ -480,7 +480,7 @@ int main(int argc, char *argv[])
|
|||
buf = (uint8_t *) calloc(size, sizeof(char));
|
||||
|
||||
if (erase_it) {
|
||||
printf("Erasing flash chip\n");
|
||||
printf("Erasing flash chip.\n");
|
||||
if (!flash->erase) {
|
||||
fprintf(stderr, "Error: flashrom has no erase function for this flash chip.\n");
|
||||
return 1;
|
||||
|
@ -517,7 +517,7 @@ int main(int argc, char *argv[])
|
|||
exit(1);
|
||||
}
|
||||
if (image_stat.st_size != flash->total_size * 1024) {
|
||||
fprintf(stderr, "Error: Image size doesnt match\n");
|
||||
fprintf(stderr, "Error: Image size doesn't match\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue