[flashrom] [commit] r1064 - trunk

[repository service]

Author: mkarcher
Date: Tue Jun 29 16:44:40 2010
New Revision: 1064
URL: http://flashrom.org/trac/coreboot/changeset/1064

Log:
Check that the expected winbond Super I/O was found

Signed-off-by: Michael Karcher <flashrom at mkarcher.dialup.fu-berlin.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>

Modified:
   trunk/board_enable.c

Modified: trunk/board_enable.c
==============================================================================
--- trunk/board_enable.c	Sun Jun 27 17:07:52 2010	(r1063)
+++ trunk/board_enable.c	Tue Jun 29 16:44:40 2010	(r1064)
@@ -264,6 +264,11 @@
 		msg_perr("\nERROR: No supported Winbond Super I/O found\n");
 		return -1;
 	}
+	if (chip->device_id != chipid) {
+		msg_perr("\nERROR: Found Winbond chip with ID 0x%x, "
+		         "expected %x\n", chip->device_id, chipid);
+		return -1;
+	}
 	if (bit >= 8 || port == 0 || port > chip->gpio_port_count) {
 		msg_perr("\nERROR: winbond_gpio_set: Invalid GPIO number %d\n",
 		         pin);