[flashrom] [commit] r1035 - trunk
repository service
svn at flashrom.org
Mon Jun 7 13:10:43 CEST 2010
Author: hailfinger
Date: Mon Jun 7 13:10:43 2010
New Revision: 1035
URL: http://flashrom.org/trac/coreboot/changeset/1035
Log:
Fix wiki board enable parameter printing. The logic was incorrect in one
place which had && instead of ||.
Move the board info #define B to the file where it is used.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Acked-by: Uwe Hermann <uwe at hermann-uwe.de>
Modified:
trunk/flash.h
trunk/print.c
trunk/print_wiki.c
Modified: trunk/flash.h
==============================================================================
--- trunk/flash.h Mon Jun 7 13:08:07 2010 (r1034)
+++ trunk/flash.h Mon Jun 7 13:10:43 2010 (r1035)
@@ -309,12 +309,6 @@
#endif
};
-#ifdef CONFIG_PRINT_WIKI
-#define B(vendor, name, status, url, note) { vendor, name, status, url, note }
-#else
-#define B(vendor, name, status, url, note) { vendor, name, status }
-#endif
-
extern const struct board_info boards_known[];
extern const struct board_info laptops_known[];
Modified: trunk/print.c
==============================================================================
--- trunk/print.c Mon Jun 7 13:08:07 2010 (r1034)
+++ trunk/print.c Mon Jun 7 13:10:43 2010 (r1035)
@@ -245,6 +245,13 @@
}
#if CONFIG_INTERNAL == 1
+
+#ifdef CONFIG_PRINT_WIKI
+#define B(vendor, name, status, url, note) { vendor, name, status, url, note }
+#else
+#define B(vendor, name, status, url, note) { vendor, name, status }
+#endif
+
/* Please keep this list alphabetically ordered by vendor/board. */
const struct board_info boards_known[] = {
#if defined(__i386__) || defined(__x86_64__)
Modified: trunk/print_wiki.c
==============================================================================
--- trunk/print_wiki.c Mon Jun 7 13:08:07 2010 (r1034)
+++ trunk/print_wiki.c Mon Jun 7 13:10:43 2010 (r1035)
@@ -145,9 +145,9 @@
color = !color;
k = 0;
- while ((b[k].vendor_name != NULL)
- && strcmp(b[k].vendor_name, boards[i].vendor)
- && strcmp(b[k].board_name, boards[i].name)) {
+ while ((b[k].vendor_name != NULL) &&
+ (strcmp(b[k].vendor_name, boards[i].vendor) ||
+ strcmp(b[k].board_name, boards[i].name))) {
k++;
}
More information about the flashrom
mailing list