This patch changes the prefix of chip constant #defines in the following way

AM_* -> AMD_AM*
AT_* -> ATMEL_AT*
EN_* -> EON_EN*
HY_* -> HYUNDAI_HY*
MBM* -> FUJITSU_MBM*
MX_ID -> MACRONIX_ID
MX_* -> MACRONIX_MX*
PMC_* -> PMC_PM*
SST_* -> SST_SST*

It leaves the Intel #defines alone because there is another pending
patch for that:
http://patchwork.coreboot.org/patch/1937/

Some background discussion here:
http://www.flashrom.org/pipermail/flashrom/2010-July/004059.html

Corresponding to flashrom svn r1175.

Signed-off-by: Mattias Mattsson <vitplister@gmail.com>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>

1 files changed, 159 insertions, 159 deletions

diff --git a/flashchips.c b/flashchips.c
index 3ab19bb..482f02a 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -61,7 +61,7 @@ struct flashchip flashchips[] = {
 		.name		= "Am29F010A/B",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= AMD_ID,
-		.model_id	= AM_29F010B,	/* Same as Am29F010A */
+		.model_id	= AMD_AM29F010B,	/* Same as Am29F010A */
 		.total_size	= 128,
 		.page_size	= 16 * 1024,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_EITHER_RESET,
@@ -87,7 +87,7 @@ struct flashchip flashchips[] = {
 		.name		= "Am29F002(N)BB",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= AMD_ID,
-		.model_id	= AM_29F002BB,
+		.model_id	= AMD_AM29F002BB,
 		.total_size	= 256,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_SHORT_RESET | FEATURE_ADDR_2AA,
@@ -118,7 +118,7 @@ struct flashchip flashchips[] = {
 		.name		= "Am29F002(N)BT",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= AMD_ID,
-		.model_id	= AM_29F002BT,
+		.model_id	= AMD_AM29F002BT,
 		.total_size	= 256,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_EITHER_RESET | FEATURE_ADDR_2AA,
@@ -149,7 +149,7 @@ struct flashchip flashchips[] = {
 		.name		= "Am29F016D",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= AMD_ID,
-		.model_id	= AM_29F016D,
+		.model_id	= AMD_AM29F016D,
 		.total_size	= 2 * 1024,
 		.page_size	= 64 * 1024,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_SHORT_RESET,
@@ -175,7 +175,7 @@ struct flashchip flashchips[] = {
 		.name		= "Am29F040B",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= AMD_ID,
-		.model_id	= AM_29F040B,
+		.model_id	= AMD_AM29F040B,
 		.total_size	= 512,
 		.page_size	= 64 * 1024,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_SHORT_RESET,
@@ -201,7 +201,7 @@ struct flashchip flashchips[] = {
 		.name		= "Am29F080B",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= AMD_ID,
-		.model_id	= AM_29F080B,
+		.model_id	= AMD_AM29F080B,
 		.total_size	= 1024,
 		.page_size	= 64 * 1024,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_SHORT_RESET,
@@ -227,7 +227,7 @@ struct flashchip flashchips[] = {
 		.name		= "Am29LV040B",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= AMD_ID,
-		.model_id	= AM_29LV040B,
+		.model_id	= AMD_AM29LV040B,
 		.total_size	= 512,
 		.page_size	= 64 * 1024,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_SHORT_RESET,
@@ -253,7 +253,7 @@ struct flashchip flashchips[] = {
 		.name		= "Am29LV081B",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= AMD_ID,
-		.model_id	= AM_29LV080B,
+		.model_id	= AMD_AM29LV080B,
 		.total_size	= 1024,
 		.page_size	= 64 * 1024,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_SHORT_RESET,
@@ -1007,7 +1007,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT25DF021",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_25DF021,
+		.model_id	= ATMEL_AT25DF021,
 		.total_size	= 256,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -1044,7 +1044,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT25DF041A",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_25DF041A,
+		.model_id	= ATMEL_AT25DF041A,
 		.total_size	= 512,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -1081,7 +1081,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT25DF081",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_25DF081,
+		.model_id	= ATMEL_AT25DF081,
 		.total_size	= 1024,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -1118,7 +1118,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT25DF081A",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_25DF081A,
+		.model_id	= ATMEL_AT25DF081A,
 		.total_size	= 1024,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -1155,7 +1155,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT25DF161",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_25DF161,
+		.model_id	= ATMEL_AT25DF161,
 		.total_size	= 2048,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -1192,7 +1192,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT25DF321",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_25DF321,
+		.model_id	= ATMEL_AT25DF321,
 		.total_size	= 4096,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -1229,7 +1229,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT25DF321A",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_25DF321A,
+		.model_id	= ATMEL_AT25DF321A,
 		.total_size	= 4096,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -1266,7 +1266,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT25DF641",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_25DF641,
+		.model_id	= ATMEL_AT25DF641,
 		.total_size	= 8192,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -1303,7 +1303,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT25DQ161",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_25DQ161,
+		.model_id	= ATMEL_AT25DQ161,
 		.total_size	= 2048,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -1340,7 +1340,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT25F512B",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_25F512B,
+		.model_id	= ATMEL_AT25F512B,
 		.total_size	= 64,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -1377,7 +1377,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT25FS010",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_25FS010,
+		.model_id	= ATMEL_AT25FS010,
 		.total_size	= 128,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -1416,7 +1416,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT25FS040",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_25FS040,
+		.model_id	= ATMEL_AT25FS040,
 		.total_size	= 512,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -1452,7 +1452,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT26DF041",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_26DF041,
+		.model_id	= ATMEL_AT26DF041,
 		.total_size	= 512,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -1474,7 +1474,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT26DF081A",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_26DF081A,
+		.model_id	= ATMEL_AT26DF081A,
 		.total_size	= 1024,
 		.page_size	= 256,
 		.tested		= TEST_OK_PR,
@@ -1509,7 +1509,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT26DF161",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_26DF161,
+		.model_id	= ATMEL_AT26DF161,
 		.total_size	= 2048,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -1544,7 +1544,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT26DF161A",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_26DF161A,
+		.model_id	= ATMEL_AT26DF161A,
 		.total_size	= 2048,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -1580,7 +1580,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT26DF321",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_26DF321,
+		.model_id	= ATMEL_AT26DF321,
 		.total_size	= 4096,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -1596,7 +1596,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT26F004",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_26F004,
+		.model_id	= ATMEL_AT26F004,
 		.total_size	= 512,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -1630,7 +1630,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT29C512",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_29C512,
+		.model_id	= ATMEL_AT29C512,
 		.total_size	= 64,
 		.page_size	= 128,
 		.feature_bits	= FEATURE_LONG_RESET,
@@ -1654,7 +1654,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT29C010A",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_29C010A,
+		.model_id	= ATMEL_AT29C010A,
 		.total_size	= 128,
 		.page_size	= 128,
 		.feature_bits	= FEATURE_LONG_RESET,
@@ -1677,7 +1677,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT29C020",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_29C020,
+		.model_id	= ATMEL_AT29C020,
 		.total_size	= 256,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_LONG_RESET,
@@ -1700,7 +1700,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT29C040A",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_29C040A,
+		.model_id	= ATMEL_AT29C040A,
 		.total_size	= 512,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_LONG_RESET,
@@ -1723,7 +1723,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT45CS1282",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_45CS1282,
+		.model_id	= ATMEL_AT45CS1282,
 		.total_size	= 16896 /* No power of two sizes */,
 		.page_size	= 1056 /* No power of two sizes */,
 		.tested		= TEST_BAD_READ,
@@ -1738,7 +1738,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT45DB011D",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_45DB011D,
+		.model_id	= ATMEL_AT45DB011D,
 		.total_size	= 128 /* Size can only be determined from status register */,
 		.page_size	= 256 /* Size can only be determined from status register */,
 		.tested		= TEST_BAD_READ,
@@ -1753,7 +1753,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT45DB021D",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_45DB021D,
+		.model_id	= ATMEL_AT45DB021D,
 		.total_size	= 256 /* Size can only be determined from status register */,
 		.page_size	= 256 /* Size can only be determined from status register */,
 		.tested		= TEST_BAD_READ,
@@ -1768,7 +1768,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT45DB041D",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_45DB041D,
+		.model_id	= ATMEL_AT45DB041D,
 		.total_size	= 512 /* Size can only be determined from status register */,
 		.page_size	= 256 /* Size can only be determined from status register */,
 		.tested		= TEST_BAD_READ,
@@ -1783,7 +1783,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT45DB081D",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_45DB081D,
+		.model_id	= ATMEL_AT45DB081D,
 		.total_size	= 1024 /* Size can only be determined from status register */,
 		.page_size	= 256 /* Size can only be determined from status register */,
 		.tested		= TEST_BAD_READ,
@@ -1798,7 +1798,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT45DB161D",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_45DB161D,
+		.model_id	= ATMEL_AT45DB161D,
 		.total_size	= 2048 /* Size can only be determined from status register */,
 		.page_size	= 512 /* Size can only be determined from status register */,
 		.tested		= TEST_BAD_READ,
@@ -1813,7 +1813,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT45DB321C",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_45DB321C,
+		.model_id	= ATMEL_AT45DB321C,
 		.total_size	= 4224 /* No power of two sizes */,
 		.page_size	= 528 /* No power of two sizes */,
 		.tested		= TEST_BAD_READ,
@@ -1828,7 +1828,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT45DB321D",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_45DB321D,
+		.model_id	= ATMEL_AT45DB321D,
 		.total_size	= 4096 /* Size can only be determined from status register */,
 		.page_size	= 512 /* Size can only be determined from status register */,
 		.tested		= TEST_BAD_READ,
@@ -1843,7 +1843,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT45DB642D",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_45DB642D,
+		.model_id	= ATMEL_AT45DB642D,
 		.total_size	= 8192 /* Size can only be determined from status register */,
 		.page_size	= 1024 /* Size can only be determined from status register */,
 		.tested		= TEST_BAD_READ,
@@ -1858,7 +1858,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT49BV512",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_49BV512,
+		.model_id	= ATMEL_AT49BV512,
 		.total_size	= 64,
 		.page_size	= 64,
 		.feature_bits	= FEATURE_EITHER_RESET,
@@ -1881,7 +1881,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT49F020",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_49F020,
+		.model_id	= ATMEL_AT49F020,
 		.total_size	= 256,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_EITHER_RESET,
@@ -1904,7 +1904,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT49F002(N)",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_49F002N,
+		.model_id	= ATMEL_AT49F002N,
 		.total_size	= 256,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_EITHER_RESET,
@@ -1935,7 +1935,7 @@ struct flashchip flashchips[] = {
 		.name		= "AT49F002(N)T",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= ATMEL_ID,
-		.model_id	= AT_49F002NT,
+		.model_id	= ATMEL_AT49F002NT,
 		.total_size	= 256,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_EITHER_RESET,
@@ -2029,7 +2029,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25B05",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25B05,
+		.model_id	= EON_EN25B05,
 		.total_size	= 64,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -2060,7 +2060,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25B05T",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25B05,
+		.model_id	= EON_EN25B05,
 		.total_size	= 64,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -2091,7 +2091,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25B10",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25B10,
+		.model_id	= EON_EN25B10,
 		.total_size	= 128,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -2122,7 +2122,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25B10T",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25B10,
+		.model_id	= EON_EN25B10,
 		.total_size	= 128,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -2153,7 +2153,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25B20",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25B20,
+		.model_id	= EON_EN25B20,
 		.total_size	= 256,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -2185,7 +2185,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25B20T",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25B20,
+		.model_id	= EON_EN25B20,
 		.total_size	= 256,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -2217,7 +2217,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25B40",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25B40,
+		.model_id	= EON_EN25B40,
 		.total_size	= 512,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -2249,7 +2249,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25B40T",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25B40,
+		.model_id	= EON_EN25B40,
 		.total_size	= 512,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -2281,7 +2281,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25B80",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25B80,
+		.model_id	= EON_EN25B80,
 		.total_size	= 1024,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -2313,7 +2313,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25B80T",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25B80,
+		.model_id	= EON_EN25B80,
 		.total_size	= 1024,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -2345,7 +2345,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25B16",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25B16,
+		.model_id	= EON_EN25B16,
 		.total_size	= 2048,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -2377,7 +2377,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25B16T",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25B16,
+		.model_id	= EON_EN25B16,
 		.total_size	= 2048,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -2409,7 +2409,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25B32",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25B32,
+		.model_id	= EON_EN25B32,
 		.total_size	= 4096,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -2441,7 +2441,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25B32T",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25B32,
+		.model_id	= EON_EN25B32,
 		.total_size	= 4096,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -2473,7 +2473,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25B64",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25B64,
+		.model_id	= EON_EN25B64,
 		.total_size	= 8192,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -2506,7 +2506,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25B64T",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25B64,
+		.model_id	= EON_EN25B64,
 		.total_size	= 8192,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -2538,7 +2538,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25D16",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25D16,
+		.model_id	= EON_EN25D16,
 		.total_size	= 2048,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -2573,7 +2573,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25F05",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25F05,
+		.model_id	= EON_EN25F05,
 		.total_size	= 64,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -2609,7 +2609,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25F10",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25F10,
+		.model_id	= EON_EN25F10,
 		.total_size	= 128,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -2645,7 +2645,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25F20",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25F20,
+		.model_id	= EON_EN25F20,
 		.total_size	= 256,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -2681,7 +2681,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25F40",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25F40,
+		.model_id	= EON_EN25F40,
 		.total_size	= 512,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -2714,7 +2714,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25F80",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25F80,
+		.model_id	= EON_EN25F80,
 		.total_size	= 1024,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -2747,7 +2747,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25F16",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25F16,
+		.model_id	= EON_EN25F16,
 		.total_size	= 2048,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -2780,7 +2780,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN25F32",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= EON_ID_NOPREFIX,
-		.model_id	= EN_25F32,
+		.model_id	= EON_EN25F32,
 		.total_size	= 4096,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -2813,7 +2813,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN29F010",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= EON_ID,
-		.model_id	= EN_29F010,
+		.model_id	= EON_EN29F010,
 		.total_size	= 128,
 		.page_size	= 128,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_EITHER_RESET,
@@ -2840,7 +2840,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN29F002(A)(N)B",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= EON_ID,
-		.model_id	= EN_29F002B,
+		.model_id	= EON_EN29F002B,
 		.total_size	= 256,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_ADDR_AAA | FEATURE_EITHER_RESET,
@@ -2871,7 +2871,7 @@ struct flashchip flashchips[] = {
 		.name		= "EN29F002(A)(N)T",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= EON_ID,
-		.model_id	= EN_29F002T,
+		.model_id	= EON_EN29F002T,
 		.total_size	= 256,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_ADDR_AAA | FEATURE_EITHER_RESET,
@@ -2902,7 +2902,7 @@ struct flashchip flashchips[] = {
 		.name		= "MBM29F004BC",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= FUJITSU_ID,
-		.model_id	= MBM29F004BC,
+		.model_id	= FUJITSU_MBM29F004BC,
 		.total_size	= 512,
 		.page_size	= 64 * 1024,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_EITHER_RESET,
@@ -2933,7 +2933,7 @@ struct flashchip flashchips[] = {
 		.name		= "MBM29F004TC",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= FUJITSU_ID,
-		.model_id	= MBM29F004TC,
+		.model_id	= FUJITSU_MBM29F004TC,
 		.total_size	= 512,
 		.page_size	= 64 * 1024,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_EITHER_RESET,
@@ -2965,7 +2965,7 @@ struct flashchip flashchips[] = {
 		.name		= "MBM29F400BC",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= FUJITSU_ID,
-		.model_id	= MBM29F400BC,
+		.model_id	= FUJITSU_MBM29F400BC,
 		.total_size	= 512,
 		.page_size	= 64 * 1024,
 		.feature_bits	= FEATURE_ADDR_SHIFTED | FEATURE_EITHER_RESET,
@@ -2996,7 +2996,7 @@ struct flashchip flashchips[] = {
 		.name		= "MBM29F400TC",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= FUJITSU_ID,
-		.model_id	= MBM29F400TC,
+		.model_id	= FUJITSU_MBM29F400TC,
 		.total_size	= 512,
 		.page_size	= 64 * 1024,
 		.feature_bits	= FEATURE_ADDR_SHIFTED | FEATURE_EITHER_RESET,
@@ -3027,7 +3027,7 @@ struct flashchip flashchips[] = {
 		.name		= "HY29F002T",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= HYUNDAI_ID,
-		.model_id	= HY_29F002T,
+		.model_id	= HYUNDAI_HY29F002T,
 		.total_size	= 256,
 		.page_size	= 256 * 1024,
 		.feature_bits	= FEATURE_EITHER_RESET, /* Some revisions may need FEATURE_ADDR_2AA */
@@ -3058,7 +3058,7 @@ struct flashchip flashchips[] = {
 		.name		= "HY29F002B",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= HYUNDAI_ID,
-		.model_id	= HY_29F002B,
+		.model_id	= HYUNDAI_HY29F002B,
 		.total_size	= 256,
 		.page_size	= 256 * 1024,
 		.feature_bits	= FEATURE_EITHER_RESET, /* Some revisions may need FEATURE_ADDR_2AA */
@@ -3348,8 +3348,8 @@ struct flashchip flashchips[] = {
 		.vendor		= "Macronix",
 		.name		= "MX25L512",
 		.bustype	= CHIP_BUSTYPE_SPI,
-		.manufacture_id	= MX_ID,
-		.model_id	= MX_25L512,
+		.manufacture_id	= MACRONIX_ID,
+		.model_id	= MACRONIX_MX25L512,
 		.total_size	= 64,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -3384,8 +3384,8 @@ struct flashchip flashchips[] = {
 		.vendor		= "Macronix",
 		.name		= "MX25L1005",
 		.bustype	= CHIP_BUSTYPE_SPI,
-		.manufacture_id	= MX_ID,
-		.model_id	= MX_25L1005,
+		.manufacture_id	= MACRONIX_ID,
+		.model_id	= MACRONIX_MX25L1005,
 		.total_size	= 128,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -3417,8 +3417,8 @@ struct flashchip flashchips[] = {
 		.vendor		= "Macronix",
 		.name		= "MX25L2005",
 		.bustype	= CHIP_BUSTYPE_SPI,
-		.manufacture_id	= MX_ID,
-		.model_id	= MX_25L2005,
+		.manufacture_id	= MACRONIX_ID,
+		.model_id	= MACRONIX_MX25L2005,
 		.total_size	= 256,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -3453,8 +3453,8 @@ struct flashchip flashchips[] = {
 		.vendor		= "Macronix",
 		.name		= "MX25L4005",
 		.bustype	= CHIP_BUSTYPE_SPI,
-		.manufacture_id	= MX_ID,
-		.model_id	= MX_25L4005,
+		.manufacture_id	= MACRONIX_ID,
+		.model_id	= MACRONIX_MX25L4005,
 		.total_size	= 512,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -3489,8 +3489,8 @@ struct flashchip flashchips[] = {
 		.vendor		= "Macronix",
 		.name		= "MX25L8005",
 		.bustype	= CHIP_BUSTYPE_SPI,
-		.manufacture_id	= MX_ID,
-		.model_id	= MX_25L8005,
+		.manufacture_id	= MACRONIX_ID,
+		.model_id	= MACRONIX_MX25L8005,
 		.total_size	= 1024,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -3525,8 +3525,8 @@ struct flashchip flashchips[] = {
 		.vendor		= "Macronix",
 		.name		= "MX25L1605",
 		.bustype	= CHIP_BUSTYPE_SPI,
-		.manufacture_id	= MX_ID,
-		.model_id	= MX_25L1605,
+		.manufacture_id	= MACRONIX_ID,
+		.model_id	= MACRONIX_MX25L1605,
 		.total_size	= 2048,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -3561,8 +3561,8 @@ struct flashchip flashchips[] = {
 		.vendor		= "Macronix",
 		.name		= "MX25L1635D",
 		.bustype	= CHIP_BUSTYPE_SPI,
-		.manufacture_id	= MX_ID,
-		.model_id	= MX_25L1635D,
+		.manufacture_id	= MACRONIX_ID,
+		.model_id	= MACRONIX_MX25L1635D,
 		.total_size	= 2048,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -3594,8 +3594,8 @@ struct flashchip flashchips[] = {
 		.vendor		= "Macronix",
 		.name		= "MX25L1635E",
 		.bustype	= CHIP_BUSTYPE_SPI,
-		.manufacture_id	= MX_ID,
-		.model_id	= MX_25L1635E,
+		.manufacture_id	= MACRONIX_ID,
+		.model_id	= MACRONIX_MX25L1635E,
 		.total_size	= 2048,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -3627,8 +3627,8 @@ struct flashchip flashchips[] = {
 		.vendor		= "Macronix",
 		.name		= "MX25L3205",
 		.bustype	= CHIP_BUSTYPE_SPI,
-		.manufacture_id	= MX_ID,
-		.model_id	= MX_25L3205,
+		.manufacture_id	= MACRONIX_ID,
+		.model_id	= MACRONIX_MX25L3205,
 		.total_size	= 4096,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -3660,8 +3660,8 @@ struct flashchip flashchips[] = {
 		.vendor		= "Macronix",
 		.name		= "MX25L3235D",
 		.bustype	= CHIP_BUSTYPE_SPI,
-		.manufacture_id	= MX_ID,
-		.model_id	= MX_25L3235D,
+		.manufacture_id	= MACRONIX_ID,
+		.model_id	= MACRONIX_MX25L3235D,
 		.total_size	= 4096,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -3693,8 +3693,8 @@ struct flashchip flashchips[] = {
 		.vendor		= "Macronix",
 		.name		= "MX25L6405",
 		.bustype	= CHIP_BUSTYPE_SPI,
-		.manufacture_id	= MX_ID,
-		.model_id	= MX_25L6405,
+		.manufacture_id	= MACRONIX_ID,
+		.model_id	= MACRONIX_MX25L6405,
 		.total_size	= 8192,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -3726,8 +3726,8 @@ struct flashchip flashchips[] = {
 		.vendor		= "Macronix",
 		.name		= "MX25L12805",
 		.bustype	= CHIP_BUSTYPE_SPI,
-		.manufacture_id	= MX_ID,
-		.model_id	= MX_25L12805,
+		.manufacture_id	= MACRONIX_ID,
+		.model_id	= MACRONIX_MX25L12805,
 		.total_size	= 16384,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_WRSR_WREN,
@@ -3759,8 +3759,8 @@ struct flashchip flashchips[] = {
 		.vendor		= "Macronix",
 		.name		= "MX29F001B",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
-		.manufacture_id	= MX_ID,
-		.model_id	= MX_29F001B,
+		.manufacture_id	= MACRONIX_ID,
+		.model_id	= MACRONIX_MX29F001B,
 		.total_size	= 128,
 		.page_size	= 32 * 1024,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_SHORT_RESET,
@@ -3791,8 +3791,8 @@ struct flashchip flashchips[] = {
 		.vendor		= "Macronix",
 		.name		= "MX29F001T",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
-		.manufacture_id	= MX_ID,
-		.model_id	= MX_29F001T,
+		.manufacture_id	= MACRONIX_ID,
+		.model_id	= MACRONIX_MX29F001T,
 		.total_size	= 128,
 		.page_size	= 32 * 1024,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_SHORT_RESET,
@@ -3823,8 +3823,8 @@ struct flashchip flashchips[] = {
 		.vendor		= "Macronix",
 		.name		= "MX29F002B",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
-		.manufacture_id	= MX_ID,
-		.model_id	= MX_29F002B,
+		.manufacture_id	= MACRONIX_ID,
+		.model_id	= MACRONIX_MX29F002B,
 		.total_size	= 256,
 		.page_size	= 64 * 1024,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_SHORT_RESET,
@@ -3854,8 +3854,8 @@ struct flashchip flashchips[] = {
 		.vendor		= "Macronix",
 		.name		= "MX29F002T",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
-		.manufacture_id	= MX_ID,
-		.model_id	= MX_29F002T,
+		.manufacture_id	= MACRONIX_ID,
+		.model_id	= MACRONIX_MX29F002T,
 		.total_size	= 256,
 		.page_size	= 64 * 1024,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_SHORT_RESET,
@@ -3885,8 +3885,8 @@ struct flashchip flashchips[] = {
 		.vendor		= "Macronix",
 		.name		= "MX29LV040",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
-		.manufacture_id	= MX_ID,
-		.model_id	= MX_29LV040,
+		.manufacture_id	= MACRONIX_ID,
+		.model_id	= MACRONIX_MX29LV040,
 		.total_size	= 512,
 		.page_size	= 64 * 1024,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_SHORT_RESET,
@@ -4239,7 +4239,7 @@ struct flashchip flashchips[] = {
 		.name		= "Pm25LV010",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= PMC_ID,
-		.model_id	= PMC_25LV010,
+		.model_id	= PMC_PM25LV010,
 		.total_size	= 128,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -4268,7 +4268,7 @@ struct flashchip flashchips[] = {
 		.name		= "Pm25LV016B",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= PMC_ID,
-		.model_id	= PMC_25LV016B,
+		.model_id	= PMC_PM25LV016B,
 		.total_size	= 2048,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -4303,7 +4303,7 @@ struct flashchip flashchips[] = {
 		.name		= "Pm25LV020",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= PMC_ID,
-		.model_id	= PMC_25LV020,
+		.model_id	= PMC_PM25LV020,
 		.total_size	= 256,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -4332,7 +4332,7 @@ struct flashchip flashchips[] = {
 		.name		= "Pm25LV040",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= PMC_ID,
-		.model_id	= PMC_25LV040,
+		.model_id	= PMC_PM25LV040,
 		.total_size	= 512,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -4361,7 +4361,7 @@ struct flashchip flashchips[] = {
 		.name		= "Pm25LV080B",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= PMC_ID,
-		.model_id	= PMC_25LV080B,
+		.model_id	= PMC_PM25LV080B,
 		.total_size	= 1024,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -4396,7 +4396,7 @@ struct flashchip flashchips[] = {
 		.name		= "Pm25LV512",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= PMC_ID,
-		.model_id	= PMC_25LV512,
+		.model_id	= PMC_PM25LV512,
 		.total_size	= 64,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -4425,7 +4425,7 @@ struct flashchip flashchips[] = {
 		.name		= "Pm29F002T",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= PMC_ID_NOPREFIX,
-		.model_id	= PMC_29F002T,
+		.model_id	= PMC_PM29F002T,
 		.total_size	= 256,
 		.page_size	= 8 * 1024,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_EITHER_RESET,
@@ -4456,7 +4456,7 @@ struct flashchip flashchips[] = {
 		.name		= "Pm29F002B",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= PMC_ID_NOPREFIX,
-		.model_id	= PMC_29F002B,
+		.model_id	= PMC_PM29F002B,
 		.total_size	= 256,
 		.page_size	= 8 * 1024,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_EITHER_RESET,
@@ -4487,7 +4487,7 @@ struct flashchip flashchips[] = {
 		.name		= "Pm39LV010",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= PMC_ID_NOPREFIX,
-		.model_id	= PMC_39F010,	/* Pm39LV010 and Pm39F010 have identical IDs but different voltage */
+		.model_id	= PMC_PM39F010,	/* Pm39LV010 and Pm39F010 have identical IDs but different voltage */
 		.total_size	= 128,
 		.page_size	= 4096,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_EITHER_RESET,
@@ -4516,7 +4516,7 @@ struct flashchip flashchips[] = {
 		.name		= "Pm39LV020",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= PMC_ID_NOPREFIX,
-		.model_id	= PMC_39LV020,
+		.model_id	= PMC_PM39LV020,
 		.total_size	= 256,
 		.page_size	= 4096,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_EITHER_RESET,
@@ -4545,7 +4545,7 @@ struct flashchip flashchips[] = {
 		.name		= "Pm39LV040",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= PMC_ID_NOPREFIX,
-		.model_id	= PMC_39LV040,
+		.model_id	= PMC_PM39LV040,
 		.total_size	= 512,
 		.page_size	= 4096,
 		.feature_bits	= FEATURE_ADDR_2AA | FEATURE_EITHER_RESET,
@@ -4574,7 +4574,7 @@ struct flashchip flashchips[] = {
 		.name		= "Pm49FL002",
 		.bustype	= CHIP_BUSTYPE_LPC | CHIP_BUSTYPE_FWH, /* A/A Mux */
 		.manufacture_id	= PMC_ID_NOPREFIX,
-		.model_id	= PMC_49FL002,
+		.model_id	= PMC_PM49FL002,
 		.total_size	= 256,
 		.page_size	= 16 * 1024,
 		.feature_bits	= FEATURE_REGISTERMAP | FEATURE_EITHER_RESET,
@@ -4604,7 +4604,7 @@ struct flashchip flashchips[] = {
 		.name		= "Pm49FL004",
 		.bustype	= CHIP_BUSTYPE_LPC | CHIP_BUSTYPE_FWH, /* A/A Mux */
 		.manufacture_id	= PMC_ID_NOPREFIX,
-		.model_id	= PMC_49FL004,
+		.model_id	= PMC_PM49FL004,
 		.total_size	= 512,
 		.page_size	= 64 * 1024,
 		.feature_bits	= FEATURE_REGISTERMAP | FEATURE_EITHER_RESET,
@@ -4744,7 +4744,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST25VF016B",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_25VF016B,
+		.model_id	= SST_SST25VF016B,
 		.total_size	= 2048,
 		.page_size	= 256,
 		.tested		= TEST_OK_PREW,
@@ -4779,7 +4779,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST25VF032B",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_25VF032B,
+		.model_id	= SST_SST25VF032B,
 		.total_size	= 4096,
 		.page_size	= 256,
 		.tested		= TEST_OK_PRW,
@@ -4814,7 +4814,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST25VF064C",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_25VF064C,
+		.model_id	= SST_SST25VF064C,
 		.total_size	= 8192,
 		.page_size	= 256,
 		.tested		= TEST_OK_PREW,
@@ -4849,7 +4849,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST25VF040.REMS",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_25VF040_REMS,
+		.model_id	= SST_SST25VF040_REMS,
 		.total_size	= 512,
 		.page_size	= 256,
 		.tested		= TEST_OK_PR,
@@ -4878,7 +4878,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST25VF040B",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_25VF040B,
+		.model_id	= SST_SST25VF040B,
 		.total_size	= 512,
 		.page_size	= 256,
 		.tested		= TEST_UNTESTED,
@@ -4913,7 +4913,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST25LF040A.RES",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_25VF040_REMS,
+		.model_id	= SST_SST25VF040_REMS,
 		.total_size	= 512,
 		.page_size	= 256,
 		.tested		= TEST_OK_PROBE,
@@ -4942,7 +4942,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST25VF040B.REMS",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_25VF040B_REMS,
+		.model_id	= SST_SST25VF040B_REMS,
 		.total_size	= 512,
 		.page_size	= 256,
 		.tested		= TEST_OK_PR,
@@ -4977,7 +4977,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST25VF080B",
 		.bustype	= CHIP_BUSTYPE_SPI,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_25VF080B,
+		.model_id	= SST_SST25VF080B,
 		.total_size	= 1024,
 		.page_size	= 256,
 		.tested		= TEST_OK_PREW,
@@ -5012,7 +5012,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST28SF040A",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_28SF040,
+		.model_id	= SST_SST28SF040,
 		.total_size	= 512,
 		.page_size	= 256,
 		.feature_bits	= 0,
@@ -5038,7 +5038,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST29EE010",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_29EE010,
+		.model_id	= SST_SST29EE010,
 		.total_size	= 128,
 		.page_size	= 128,
 		.feature_bits	= FEATURE_LONG_RESET,
@@ -5061,7 +5061,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST29LE010",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_29LE010,
+		.model_id	= SST_SST29LE010,
 		.total_size	= 128,
 		.page_size	= 128,
 		.feature_bits	= FEATURE_LONG_RESET,
@@ -5084,7 +5084,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST29EE020A",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_29EE020A,
+		.model_id	= SST_SST29EE020A,
 		.total_size	= 256,
 		.page_size	= 128,
 		.feature_bits	= FEATURE_LONG_RESET,
@@ -5107,7 +5107,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST29LE020",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_29LE020,
+		.model_id	= SST_SST29LE020,
 		.total_size	= 256,
 		.page_size	= 128,
 		.feature_bits	= FEATURE_LONG_RESET,
@@ -5130,7 +5130,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST39SF512",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_39SF512,
+		.model_id	= SST_SST39SF512,
 		.total_size	= 64,
 		.page_size	= 4096,
 		.feature_bits	= FEATURE_EITHER_RESET,
@@ -5156,7 +5156,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST39SF010A",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_39SF010,
+		.model_id	= SST_SST39SF010,
 		.total_size	= 128,
 		.page_size	= 4096,
 		.feature_bits	= FEATURE_EITHER_RESET,
@@ -5182,7 +5182,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST39SF020A",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_39SF020,
+		.model_id	= SST_SST39SF020,
 		.total_size	= 256,
 		.page_size	= 4096,
 		.feature_bits	= FEATURE_EITHER_RESET,
@@ -5208,7 +5208,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST39SF040",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_39SF040,
+		.model_id	= SST_SST39SF040,
 		.total_size	= 512,
 		.page_size	= 4096,
 		.feature_bits	= FEATURE_EITHER_RESET,
@@ -5234,7 +5234,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST39VF512",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_39VF512,
+		.model_id	= SST_SST39VF512,
 		.total_size	= 64,
 		.page_size	= 4096,
 		.feature_bits	= FEATURE_EITHER_RESET,
@@ -5260,7 +5260,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST39VF010",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_39VF010,
+		.model_id	= SST_SST39VF010,
 		.total_size	= 128,
 		.page_size	= 4096,
 		.feature_bits	= FEATURE_EITHER_RESET,
@@ -5286,7 +5286,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST39VF020",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_39VF020,
+		.model_id	= SST_SST39VF020,
 		.total_size	= 256,
 		.page_size	= 4096,
 		.feature_bits	= FEATURE_EITHER_RESET,
@@ -5312,7 +5312,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST39VF040",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_39VF040,
+		.model_id	= SST_SST39VF040,
 		.total_size	= 512,
 		.page_size	= 4096,
 		.feature_bits	= FEATURE_EITHER_RESET,
@@ -5338,7 +5338,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST39VF080",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_39VF080,
+		.model_id	= SST_SST39VF080,
 		.total_size	= 1024,
 		.page_size	= 4096,
 		.feature_bits	= FEATURE_EITHER_RESET,
@@ -5367,7 +5367,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST49LF002A/B",
 		.bustype	= CHIP_BUSTYPE_FWH, /* A/A Mux */
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_49LF002A,
+		.model_id	= SST_SST49LF002A,
 		.total_size	= 256,
 		.page_size	= 16 * 1024,
 		.feature_bits	= FEATURE_REGISTERMAP | FEATURE_EITHER_RESET,
@@ -5398,7 +5398,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST49LF003A/B",
 		.bustype	= CHIP_BUSTYPE_FWH, /* A/A Mux */
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_49LF003A,
+		.model_id	= SST_SST49LF003A,
 		.total_size	= 384,
 		.page_size	= 64 * 1024,
 		.feature_bits	= FEATURE_REGISTERMAP | FEATURE_EITHER_RESET,
@@ -5432,7 +5432,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST49LF004A/B",
 		.bustype	= CHIP_BUSTYPE_FWH, /* A/A Mux */
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_49LF004A,
+		.model_id	= SST_SST49LF004A,
 		.total_size	= 512,
 		.page_size	= 64 * 1024,
 		.feature_bits	= FEATURE_REGISTERMAP | FEATURE_EITHER_RESET,
@@ -5463,7 +5463,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST49LF004C",
 		.bustype	= CHIP_BUSTYPE_FWH,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_49LF004C,
+		.model_id	= SST_SST49LF004C,
 		.total_size	= 512,
 		.page_size	= 4 * 1024,
 		.feature_bits	= FEATURE_REGISTERMAP,
@@ -5495,7 +5495,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST49LF008A",
 		.bustype	= CHIP_BUSTYPE_FWH, /* A/A Mux */
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_49LF008A,
+		.model_id	= SST_SST49LF008A,
 		.total_size	= 1024,
 		.page_size	= 64 * 1024,
 		.feature_bits	= FEATURE_REGISTERMAP | FEATURE_EITHER_RESET,
@@ -5526,7 +5526,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST49LF008C",
 		.bustype	= CHIP_BUSTYPE_FWH,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_49LF008C,
+		.model_id	= SST_SST49LF008C,
 		.total_size	= 1024,
 		.page_size	= 4 * 1024,
 		.feature_bits	= FEATURE_REGISTERMAP,
@@ -5558,7 +5558,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST49LF016C",
 		.bustype	= CHIP_BUSTYPE_FWH,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_49LF016C,
+		.model_id	= SST_SST49LF016C,
 		.total_size	= 2048,
 		.page_size	= 4 * 1024,
 		.feature_bits	= FEATURE_REGISTERMAP,
@@ -5590,7 +5590,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST49LF020",
 		.bustype	= CHIP_BUSTYPE_LPC,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_49LF020,
+		.model_id	= SST_SST49LF020,
 		.total_size	= 256,
 		.page_size	= 16 * 1024,
 		.feature_bits	= FEATURE_EITHER_RESET,
@@ -5619,7 +5619,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST49LF020A",
 		.bustype	= CHIP_BUSTYPE_LPC,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_49LF020A,
+		.model_id	= SST_SST49LF020A,
 		.total_size	= 256,
 		.page_size	= 4 * 1024,
 		.feature_bits	= FEATURE_EITHER_RESET,
@@ -5648,7 +5648,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST49LF040",
 		.bustype	= CHIP_BUSTYPE_LPC,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_49LF040,
+		.model_id	= SST_SST49LF040,
 		.total_size	= 512,
 		.page_size	= 4096,
 		.feature_bits	= FEATURE_EITHER_RESET,
@@ -5677,7 +5677,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST49LF040B",
 		.bustype	= CHIP_BUSTYPE_LPC, /* A/A Mux */
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_49LF040B,
+		.model_id	= SST_SST49LF040B,
 		.total_size	= 512,
 		.page_size	= 64 * 1024,
 		.feature_bits	= FEATURE_EITHER_RESET | FEATURE_REGISTERMAP,
@@ -5707,7 +5707,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST49LF080A",
 		.bustype	= CHIP_BUSTYPE_LPC, /* A/A Mux */
 		.manufacture_id	= SST_ID,
- 		.model_id	= SST_49LF080A,
+ 		.model_id	= SST_SST49LF080A,
 		.total_size	= 1024,
 		.page_size	= 4096,
 		.feature_bits	= FEATURE_EITHER_RESET,
@@ -5736,7 +5736,7 @@ struct flashchip flashchips[] = {
 		.name		= "SST49LF160C",
 		.bustype	= CHIP_BUSTYPE_LPC,
 		.manufacture_id	= SST_ID,
-		.model_id	= SST_49LF160C,
+		.model_id	= SST_SST49LF160C,
 		.total_size	= 2048,
 		.page_size	= 4 * 1024,
 		.feature_bits	= FEATURE_REGISTERMAP,
@@ -7740,7 +7740,7 @@ struct flashchip flashchips[] = {
 		.vendor		= "Macronix",
 		.name		= "unknown Macronix SPI chip",
 		.bustype	= CHIP_BUSTYPE_SPI,
-		.manufacture_id	= MX_ID,
+		.manufacture_id	= MACRONIX_ID,
 		.model_id	= GENERIC_DEVICE_ID,
 		.total_size	= 0,
 		.page_size	= 256,