Unify AMD manufacture_id and model_id

Corresponding to flashrom svn r564.

Signed-off-by: Mateusz Murawski <matowy@tlen.pl>
Acked-by: FENG Yu Ning <fengyuning1984@gmail.com>
diff --git a/flash.h b/flash.h
index 1668a57..8cb13cd 100644
--- a/flash.h
+++ b/flash.h
@@ -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 */
diff --git a/flashchips.c b/flashchips.c
index cf96db7..f211539 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -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,