summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-01-12 23:55:41 +0100
committerWolfgang Denk <wd@denx.de>2011-01-12 23:55:41 +0100
commit83e5c1c1e1ab29a5b84807bbf7f5dc0561ec83d8 (patch)
tree5c8b08712582ea3853b93754a447da0c32d7e7e7
parentd52595f69edabc22032dfff52fc0e20c50298565 (diff)
parent3b8b240ddbd4ec399934c0becb43761c4a8be284 (diff)
downloadu-boot-imx-83e5c1c1e1ab29a5b84807bbf7f5dc0561ec83d8.zip
u-boot-imx-83e5c1c1e1ab29a5b84807bbf7f5dc0561ec83d8.tar.gz
u-boot-imx-83e5c1c1e1ab29a5b84807bbf7f5dc0561ec83d8.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash
-rw-r--r--drivers/mtd/jedec_flash.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/mtd/jedec_flash.c b/drivers/mtd/jedec_flash.c
index 223fb71..da8c9b1 100644
--- a/drivers/mtd/jedec_flash.c
+++ b/drivers/mtd/jedec_flash.c
@@ -41,6 +41,7 @@
#define AM29DL800BB 0x22CB
#define AM29DL800BT 0x224A
+#define AM29F400BB 0x22AB
#define AM29F800BB 0x2258
#define AM29F800BT 0x22D6
#define AM29LV400BB 0x22BA
@@ -296,6 +297,23 @@ static const struct amd_flash_info jedec_table[] = {
#ifdef CONFIG_SYS_FLASH_LEGACY_512Kx16
{
.mfr_id = (u16)AMD_MANUFACT,
+ .dev_id = AM29F400BB,
+ .name = "AMD AM29F400BB",
+ .uaddr = {
+ [1] = MTD_UADDR_0x0555_0x02AA /* x16 */
+ },
+ .DevSize = SIZE_512KiB,
+ .CmdSet = CFI_CMDSET_AMD_LEGACY,
+ .NumEraseRegions= 4,
+ .regions = {
+ ERASEINFO(0x04000, 1),
+ ERASEINFO(0x02000, 2),
+ ERASEINFO(0x08000, 1),
+ ERASEINFO(0x10000, 7),
+ }
+ },
+ {
+ .mfr_id = (u16)AMD_MANUFACT,
.dev_id = AM29LV400BB,
.name = "AMD AM29LV400BB",
.uaddr = {