GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 22:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.denx.de/u-boot-at91

Browse source
This commit is contained in:
Wolfgang Denk 2008-07-13 14:40:30 +02:00
commit a07351fdba
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
MAKEALL
View file

@ -461,13 +461,6 @@ LIST_ARM7=" \
######################################################################### #########################################################################
LIST_ARM9=" \ LIST_ARM9=" \
at91cap9adk \
at91rm9200dk \
at91sam9260ek \
at91sam9261ek \
at91sam9263ek \
at91sam9rlek \
cmc_pu2 \
ap920t \ ap920t \
ap922_XA10 \ ap922_XA10 \
ap926ejs \ ap926ejs \
@ -478,11 +471,7 @@ LIST_ARM9=" \
cp926ejs \ cp926ejs \
cp946es \ cp946es \
cp966 \ cp966 \
csb637 \
kb9202 \
lpd7a400 \ lpd7a400 \
m501sk \
mp2usb \
mx1ads \ mx1ads \
mx1fs2 \ mx1fs2 \
netstar \ netstar \
@ -587,6 +576,7 @@ LIST_arm=" \
${LIST_ARM9} \ ${LIST_ARM9} \
${LIST_ARM10} \ ${LIST_ARM10} \
${LIST_ARM11} \ ${LIST_ARM11} \
${LIST_at91} \
${LIST_pxa} \ ${LIST_pxa} \
${LIST_ixp} \ ${LIST_ixp} \
" "

14
drivers/mtd/dataflash.c
View file

@ -54,6 +54,17 @@ int AT91F_DataflashInit (void)
&dataflash_info[i].Desc); &dataflash_info[i].Desc);
switch (dfcode) { 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: case AT45DB161:
dataflash_info[i].Device.pages_number = 4096; dataflash_info[i].Device.pages_number = 4096;
dataflash_info[i].Device.pages_size = 528; dataflash_info[i].Device.pages_size = 528;
@ -178,6 +189,9 @@ void dataflash_print_info (void)
if (dataflash_info[i].id != 0) { if (dataflash_info[i].id != 0) {
printf("DataFlash:"); printf("DataFlash:");
switch (dataflash_info[i].id) { switch (dataflash_info[i].id) {
case AT45DB021:
printf("AT45DB021\n");
break;
case AT45DB161: case AT45DB161:
printf("AT45DB161\n"); printf("AT45DB161\n");
break; break;

1
include/dataflash.h
View file

@ -137,6 +137,7 @@ struct dataflash_addr {
/*-------------------------------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------------------------------*/
#define AT45DB161 0x2c #define AT45DB161 0x2c
#define AT45DB021 0x14
#define AT45DB321 0x34 #define AT45DB321 0x34
#define AT45DB642 0x3c #define AT45DB642 0x3c
#define AT45DB128 0x10 #define AT45DB128 0x10