[coreboot] [flashrom] r599 - trunk

Author: uwe
Date: 2009-06-17 01:15:10 +0200 (Wed, 17 Jun 2009)
New Revision: 599

Modified:
   trunk/board_enable.c
   trunk/chipset_enable.c
   trunk/flashrom.c
Log:
List the size (in KB) and type of supported flash chips in 'flashrom -L'.

Also, list how many chips/chipsets/boards we support in 'flashrom -L'.

Signed-off-by: Uwe Hermann 
Acked-by: Carl-Daniel Hailfinger

Modified: trunk/board_enable.c
===================================================================
--- trunk/board_enable.c	2009-06-16 21:08:06 UTC (rev 598)
+++ trunk/board_enable.c	2009-06-16 23:15:10 UTC (rev 599)
@@ -829,8 +829,11 @@

void print_supported_boards_helper(const struct board_info *b)
 {
-	int i, j;
+	int i, j, boardcount = 0;

+	for (i = 0; b[i].vendor != NULL; i++)
+		boardcount++;
+
    for (i = 0; b[i].vendor != NULL; i++) {
    	printf("%s", b[i].vendor);
    	for (j = 0; j < 25 - strlen(b[i].vendor); j++)
@@ -844,12 +847,16 @@

void print_supported_boards(void)
 {
-	int i, j;
+	int i, j, boardcount = 0;
    struct board_pciid_enable *b = board_pciid_enables;

-	printf("\nSupported boards which need write-enable code:\n\nVendor:   "
-	       "               Board:                   Required option:\n\n");
+	for (i = 0; b[i].vendor_name != NULL; i++)
+		boardcount++;

+	printf("\nSupported boards which need write-enable code (total: %d):"
+	       "\n\nVendor:                  Board:                   "
+	       "Required option:\n\n", boardcount);
+
    for (i = 0; b[i].vendor_name != NULL; i++) {
    	printf("%s", b[i].vendor_name);
    	for (j = 0; j < 25 - strlen(b[i].vendor_name); j++)
@@ -863,10 +870,16 @@
    		printf("(none, board is autodetected)\n");
    }

-	printf("\nSupported boards which don't need write-enable code:\n\n");
+	for (i = 0, boardcount = 0; boards_ok[i].vendor != NULL; i++)
+		boardcount++;
+	printf("\nSupported boards which don't need write-enable code "
+	       "(total: %d):\n\n", boardcount);
    print_supported_boards_helper(boards_ok);

-	printf("\nBoards which have been verified to NOT work (yet):\n\n");
+	for (i = 0, boardcount = 0; boards_bad[i].vendor != NULL; i++)
+		boardcount++;
+	printf("\nBoards which have been verified to NOT work yet "
+	       "(total: %d):\n\n", boardcount);
    print_supported_boards_helper(boards_bad);
 }

Modified: trunk/chipset_enable.c
===================================================================
--- trunk/chipset_enable.c	2009-06-16 21:08:06 UTC (rev 598)
+++ trunk/chipset_enable.c	2009-06-16 23:15:10 UTC (rev 599)
@@ -1037,12 +1037,15 @@

void print_supported_chipsets(void)
 {
-	int i, j;
+	int i, j, chipsetcount = 0;
    const struct penable *c = chipset_enables;

-	printf("\nSupported chipsets:\n\nVendor:                  Chipset:"
-	       "                 PCI IDs:\n\n");
+	for (i = 0; c[i].vendor_name != NULL; i++)
+		chipsetcount++;

+	printf("\nSupported chipsets (total: %d):\n\nVendor:                  "
+	       "Chipset:                 PCI IDs:\n\n", chipsetcount);
+
    for (i = 0; c[i].vendor_name != NULL; i++) {
    	printf("%s", c[i].vendor_name);
    	for (j = 0; j < 25 - strlen(c[i].vendor_name); j++)

Modified: trunk/flashrom.c
===================================================================
--- trunk/flashrom.c	2009-06-16 21:08:06 UTC (rev 598)
+++ trunk/flashrom.c	2009-06-16 23:15:10 UTC (rev 599)
@@ -516,9 +516,22 @@
 #endif
 #define POS_PRINT(x) do { pos += strlen(x); printf(x); } while (0)

+static int digits(int n)
+{
+	int i;
+
+	if (!n)
+		return 1;
+
+	for (i = 0; n; ++i)
+		n /= 10;
+
+	return i;
+}
+
 void print_supported_chips(void)
 {
-	int okcol = 0, pos = 0, i;
+	int okcol = 0, pos = 0, i, chipcount = 0;
    struct flashchip *f;

for (f = flashchips; f->name != NULL; f++) {
@@ -528,14 +541,19 @@
    }
    okcol = (okcol + 7) & ~7;

-	printf("Supported flash chips:\n\n");
+	for (f = flashchips; f->name != NULL; f++)
+		chipcount++;
+
+	printf("\nSupported flash chips (total: %d):\n\n", chipcount);
    POS_PRINT("Vendor:   Device:");
    while (pos < okcol) {
    	printf("\t");
    	pos += 8 - (pos % 8);
    }
-	printf("Tested OK operations:\tKnown BAD operations:\n\n");

+	printf("Tested OK:\tKnown BAD:  Size/KB:  Type:\n\n");
+	printf("(P = PROBE, R = READ, E = ERASE, W = WRITE)\n\n");
+
    for (f = flashchips; f->name != NULL; f++) {
    	/* Don't print "unknown XXXX SPI chip" entries. */
    	if (!strncmp(f->name, "unknown", 7))
@@ -553,29 +571,33 @@
    	}
    	if ((f->tested & TEST_OK_MASK)) {
    		if ((f->tested & TEST_OK_PROBE))
-				POS_PRINT("PROBE ");
+				POS_PRINT("P ");
    		if ((f->tested & TEST_OK_READ))
-				POS_PRINT("READ ");
+				POS_PRINT("R ");
    		if ((f->tested & TEST_OK_ERASE))
-				POS_PRINT("ERASE ");
+				POS_PRINT("E ");
    		if ((f->tested & TEST_OK_WRITE))
-				POS_PRINT("WRITE");
+				POS_PRINT("W ");
    	}
-		while (pos < okcol + 24) {
+		while (pos < okcol + 9) {
    		printf("\t");
    		pos += 8 - (pos % 8);
    	}
    	if ((f->tested & TEST_BAD_MASK)) {
    		if ((f->tested & TEST_BAD_PROBE))
-				printf("PROBE ");
+				printf("P ");
    		if ((f->tested & TEST_BAD_READ))
-				printf("READ ");
+				printf("R ");
    		if ((f->tested & TEST_BAD_ERASE))
-				printf("ERASE ");
+				printf("E ");
    		if ((f->tested & TEST_BAD_WRITE))
-				printf("WRITE");
+				printf("W ");
    	}
-		printf("\n");
+
+		printf("\t    %d", f->total_size);
+		for (i = 0; i < 10 - digits(f->total_size); i++)
+			printf(" ");
+		printf("%s\n", flashbuses_to_text(f->bustype));
    }
 }