diff options
author | Wolfgang Denk <wd@denx.de> | 2008-07-13 14:40:30 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-07-13 14:40:30 +0200 |
commit | a07351fdbad1a92746d75a195eaef25d146c7f87 (patch) | |
tree | d88915ef5598e2859558d65df8a07922374bfb75 | |
parent | bde63587622c4b830a27d1ddf7265843de9e994f (diff) | |
parent | fdd70d1921b87287d9a99d1be99bc35226c2b412 (diff) | |
download | u-boot-a07351fdbad1a92746d75a195eaef25d146c7f87.zip u-boot-a07351fdbad1a92746d75a195eaef25d146c7f87.tar.gz u-boot-a07351fdbad1a92746d75a195eaef25d146c7f87.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-at91
-rwxr-xr-x | MAKEALL | 12 | ||||
-rw-r--r-- | drivers/mtd/dataflash.c | 14 | ||||
-rw-r--r-- | include/dataflash.h | 1 |
3 files changed, 16 insertions, 11 deletions
@@ -461,13 +461,6 @@ LIST_ARM7=" \ ######################################################################### LIST_ARM9=" \ - at91cap9adk \ - at91rm9200dk \ - at91sam9260ek \ - at91sam9261ek \ - at91sam9263ek \ - at91sam9rlek \ - cmc_pu2 \ ap920t \ ap922_XA10 \ ap926ejs \ @@ -478,11 +471,7 @@ LIST_ARM9=" \ cp926ejs \ cp946es \ cp966 \ - csb637 \ - kb9202 \ lpd7a400 \ - m501sk \ - mp2usb \ mx1ads \ mx1fs2 \ netstar \ @@ -587,6 +576,7 @@ LIST_arm=" \ ${LIST_ARM9} \ ${LIST_ARM10} \ ${LIST_ARM11} \ + ${LIST_at91} \ ${LIST_pxa} \ ${LIST_ixp} \ " diff --git a/drivers/mtd/dataflash.c b/drivers/mtd/dataflash.c index 8247aa0..a092dc6 100644 --- a/drivers/mtd/dataflash.c +++ b/drivers/mtd/dataflash.c @@ -54,6 +54,17 @@ int AT91F_DataflashInit (void) &dataflash_info[i].Desc); switch (dfcode) { + case AT45DB021: + dataflash_info[i].Device.pages_number = 1024; + dataflash_info[i].Device.pages_size = 263; + dataflash_info[i].Device.page_offset = 9; + dataflash_info[i].Device.byte_mask = 0x300; + dataflash_info[i].Device.cs = cs[i].cs; + dataflash_info[i].Desc.DataFlash_state = IDLE; + dataflash_info[i].logical_address = cs[i].addr; + dataflash_info[i].id = dfcode; + found[i] += dfcode;; + break; case AT45DB161: dataflash_info[i].Device.pages_number = 4096; dataflash_info[i].Device.pages_size = 528; @@ -178,6 +189,9 @@ void dataflash_print_info (void) if (dataflash_info[i].id != 0) { printf("DataFlash:"); switch (dataflash_info[i].id) { + case AT45DB021: + printf("AT45DB021\n"); + break; case AT45DB161: printf("AT45DB161\n"); break; diff --git a/include/dataflash.h b/include/dataflash.h index f20c738..80f0633 100644 --- a/include/dataflash.h +++ b/include/dataflash.h @@ -137,6 +137,7 @@ struct dataflash_addr { /*-------------------------------------------------------------------------------------------------*/ #define AT45DB161 0x2c +#define AT45DB021 0x14 #define AT45DB321 0x34 #define AT45DB642 0x3c #define AT45DB128 0x10 |