[flashrom] r564 - trunk

Author: hailfinger
Date: 2009-06-02 02:38:14 +0200 (Tue, 02 Jun 2009)
New Revision: 564

Modified:
   trunk/flash.h
   trunk/flashchips.c
Log:
Unify AMD manufacture_id and model_id

Signed-off-by: Mateusz Murawski 
Acked-by: FENG Yu Ning

Modified: trunk/flash.h
===================================================================
--- trunk/flash.h	2009-06-01 22:07:52 UTC (rev 563)
+++ trunk/flash.h	2009-06-02 00:38:14 UTC (rev 564)
@@ -248,7 +248,9 @@
 #define AM_29F002BT		0xB0
 #define AM_29F002BB		0x34
 #define AM_29F040B		0xA4
+#define AM_29F080B		0xD5
 #define AM_29LV040B		0x4F
+#define AM_29LV081B		0x38
 #define AM_29F016D		0xAD

#define AMIC_ID			0x7F37	/* AMIC */

Modified: trunk/flashchips.c
===================================================================
--- trunk/flashchips.c	2009-06-01 22:07:52 UTC (rev 563)
+++ trunk/flashchips.c	2009-06-02 00:38:14 UTC (rev 564)
@@ -101,8 +101,8 @@
    	.vendor		= "AMD",
    	.name		= "Am29F080B",
    	.bustype	= CHIP_BUSTYPE_NONSPI,
-		.manufacture_id	= 0x01,
-		.model_id	= 0xd5,
+		.manufacture_id	= AMD_ID,
+		.model_id	= AM_29F080B,
    	.total_size	= 1024,
    	.page_size	= 64 * 1024,
    	.tested		= TEST_UNTESTED,
@@ -131,8 +131,8 @@
    	.vendor		= "AMD",
    	.name		= "Am29LV081B",
    	.bustype	= CHIP_BUSTYPE_NONSPI,
-		.manufacture_id	= 0x01,
-		.model_id	= 0x38,
+		.manufacture_id	= AMD_ID,
+		.model_id	= AM_29LV081B,
    	.total_size	= 1024,
    	.page_size	= 64 * 1024,
    	.tested		= TEST_UNTESTED,