From 023af76b2b3bc150d984fbad785e29f65219bcdd Mon Sep 17 00:00:00 2001 From: Scott Tsai Date: Fri, 31 Mar 2006 11:36:06 +0000 Subject: [PATCH] Multiple unrelated changes * SST_49LF040B flash support for flashrom * add ICH4-M support to flashrom Corresponding to flashrom svn r52 and coreboot v2 svn r2230. Signed-off-by: Scott Tsai --- flash.h | 1 + flash_enable.c | 1 + flashchips.c | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/flash.h b/flash.h index c43df87c4..3e67e18b2 100644 --- a/flash.h +++ b/flash.h @@ -43,6 +43,7 @@ extern struct flashchip flashchips[]; #define SST_28SF040 0x04 /* SST 29EE040 device code */ #define SST_39SF020 0xB6 /* SST 39SF020 device */ #define SST_39VF020 0xD6 /* SST 39VF020 device */ +#define SST_49LF040B 0x50 /* SST 49LF040B device */ #define SST_49LF040 0x51 /* SST 49LF040 device */ #define SST_49LF080A 0x5B /* SST 48LF080A device */ #define SST_49LF002A 0x57 /* SST 49LF002A device */ diff --git a/flash_enable.c b/flash_enable.c index 8334b6df6..d03a36b94 100644 --- a/flash_enable.c +++ b/flash_enable.c @@ -385,6 +385,7 @@ static FLASH_ENABLE enables[] = { {0x1039, 0x0630, "sis630", enable_flash_sis630}, {0x8086, 0x2480, "E7500", enable_flash_e7500}, {0x8086, 0x24c0, "ICH4", enable_flash_ich4}, + {0x8086, 0x24cc, "ICH4-M", enable_flash_ich4}, {0x8086, 0x24d0, "ICH5", enable_flash_ich4}, {0x8086, 0x27b8, "ICH7", enable_flash_ich7}, {0x1106, 0x8231, "VT8231", enable_flash_vt8231}, diff --git a/flashchips.c b/flashchips.c index 9a4b71a1b..c7a2cb58c 100644 --- a/flashchips.c +++ b/flashchips.c @@ -56,6 +56,10 @@ struct flashchip flashchips[] = { probe_jedec, erase_chip_jedec, write_39sf020,NULL}, {"SST39VF020", SST_ID, SST_39VF020, NULL, 256, 4096, probe_jedec, erase_chip_jedec, write_39sf020,NULL}, +// assume similar to 004B, ignoring data sheet + {"SST49LF040B", SST_ID, SST_49LF040B, NULL, 512, 64 * 1024, + probe_sst_fwhub, erase_sst_fwhub, write_sst_fwhub,NULL}, + {"SST49LF040", SST_ID, SST_49LF040, NULL, 512, 4096, probe_jedec, erase_49lf040, write_49lf040,NULL}, {"SST49LF080A", SST_ID, SST_49LF080A, NULL, 1024, 4096,