[flashrom] [PATCH] Kill spurious cbtable related board enable warning

Carl-Daniel Hailfinger c-d.hailfinger.devel.2006 at gmx.net
Mon Jul 27 19:39:36 CEST 2009


Boards with coreboot have a cbtable containing vendor and board name.
flashrom tries to match these with board enable entries in its database.
If no such board enable entry exists because the board doesn't need one,
flashrom complains. Silence that complaint.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>

Index: flashrom-cbtable_boardenable_nowarn/flash.h
===================================================================
--- flashrom-cbtable_boardenable_nowarn/flash.h	(Revision 667)
+++ flashrom-cbtable_boardenable_nowarn/flash.h	(Arbeitskopie)
@@ -402,6 +402,7 @@
 /* cbtable.c */
 int coreboot_init(void);
 extern char *lb_part, *lb_vendor;
+extern int partvendor_from_cbtable;
 
 /* spi.c */
 enum spi_controller {
Index: flashrom-cbtable_boardenable_nowarn/cbtable.c
===================================================================
--- flashrom-cbtable_boardenable_nowarn/cbtable.c	(Revision 667)
+++ flashrom-cbtable_boardenable_nowarn/cbtable.c	(Arbeitskopie)
@@ -31,6 +31,7 @@
 #include "coreboot_tables.h"
 
 char *lb_part = NULL, *lb_vendor = NULL;
+int partvendor_from_cbtable = 0;
 
 static unsigned long compute_checksum(void *addr, unsigned long length)
 {
@@ -150,6 +151,7 @@
 	if (lb_part) {
 		printf("Overwritten by command line, vendor ID: %s, part ID: %s.\n", lb_vendor, lb_part);
 	} else {
+		partvendor_from_cbtable = 1;
 		lb_part = strdup(part);
 		lb_vendor = strdup(vendor);
 	}
Index: flashrom-cbtable_boardenable_nowarn/board_enable.c
===================================================================
--- flashrom-cbtable_boardenable_nowarn/board_enable.c	(Revision 667)
+++ flashrom-cbtable_boardenable_nowarn/board_enable.c	(Arbeitskopie)
@@ -1134,7 +1134,14 @@
 	if (partmatch)
 		return partmatch;
 
-	printf("\nUnknown vendor:board from coreboot table or -m option: %s:%s\n\n", vendor, part);
+	if (partvendor_from_cbtable) {
+		printf("vendor:board from coreboot table is %s:%s, apparently "
+		       "no board specific flash chip write enable is needed.\n",
+		       vendor, part);
+	} else {
+		printf("\nUnknown vendor:board from -m option: %s:%s\n\n",
+		       vendor, part);
+	}
 	return NULL;
 }
 


-- 
http://www.hailfinger.org/





More information about the flashrom mailing list