brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wolfgang Denk 2008-12-05 00:27:19 +01:00
commit 90665e3d97
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpu/arm920t/start.S
View File

@ -118,7 +118,7 @@ start_code:
bl coloured_LED_init bl coloured_LED_init
bl red_LED_on bl red_LED_on
#if defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK) || defined(CONFIG_AT91RM9200DF) #if defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK)
/* /*
* relocate exception table * relocate exception table
*/ */
@ -258,7 +258,7 @@ cpu_init_crit:
* find a lowlevel_init.S in your board directory. * find a lowlevel_init.S in your board directory.
*/ */
mov ip, lr mov ip, lr
#if defined(CONFIG_AT91RM9200EK) || defined(CONFIG_AT91RM9200DF) #if defined(CONFIG_AT91RM9200EK)
#else #else
bl lowlevel_init bl lowlevel_init

25
drivers/mtd/dataflash.c
View File

@ -131,14 +131,14 @@ int AT91F_DataflashInit (void)
break; break;
} }
/* set the last area end to the dataflash size*/ /* set the last area end to the dataflash size*/
area_list[NB_DATAFLASH_AREA -1].end = dataflash_info[i].end_address =
(dataflash_info[i].Device.pages_number * (dataflash_info[i].Device.pages_number *
dataflash_info[i].Device.pages_size)-1; dataflash_info[i].Device.pages_size) - 1;
part = 0; part = 0;
last_part = 0; last_part = 0;
/* set the area addresses */ /* set the area addresses */
for(j = 0; j<NB_DATAFLASH_AREA; j++) { for(j = 0; j < NB_DATAFLASH_AREA; j++) {
if(found[i]!=0) { if(found[i]!=0) {
dataflash_info[i].Device.area_list[j].start = dataflash_info[i].Device.area_list[j].start =
area_list[part].start + area_list[part].start +
@ -146,7 +146,7 @@ int AT91F_DataflashInit (void)
if(area_list[part].end == 0xffffffff) { if(area_list[part].end == 0xffffffff) {
dataflash_info[i].Device.area_list[j].end = dataflash_info[i].Device.area_list[j].end =
dataflash_info[i].end_address + dataflash_info[i].end_address +
dataflash_info [i].logical_address; dataflash_info[i].logical_address;
last_part = 1; last_part = 1;
} else { } else {
dataflash_info[i].Device.area_list[j].end = dataflash_info[i].Device.area_list[j].end =
@ -180,12 +180,11 @@ void AT91F_DataflashSetEnv (void)
unsigned long start; unsigned long start;
for (i = 0, part= 0; i < CONFIG_SYS_MAX_DATAFLASH_BANKS; i++) { for (i = 0, part= 0; i < CONFIG_SYS_MAX_DATAFLASH_BANKS; i++) {
for(j = 0; j<NB_DATAFLASH_AREA; j++) { for(j = 0; j < NB_DATAFLASH_AREA; j++) {
env = area_list[part].setenv; env = area_list[part].setenv;
/* Set the environment according to the label...*/ /* Set the environment according to the label...*/
if((env & FLAG_SETENV) == FLAG_SETENV) { if((env & FLAG_SETENV) == FLAG_SETENV) {
start = start = dataflash_info[i].Device.area_list[j].start;
dataflash_info[i].Device.area_list[j].start;
sprintf((char*) s,"%lX",start); sprintf((char*) s,"%lX",start);
setenv((char*) area_list[part].label,(char*) s); setenv((char*) area_list[part].label,(char*) s);
} }
@ -230,7 +229,7 @@ void dataflash_print_info (void)
(unsigned int) dataflash_info[i].Device.pages_number * (unsigned int) dataflash_info[i].Device.pages_number *
dataflash_info[i].Device.pages_size, dataflash_info[i].Device.pages_size,
(unsigned int) dataflash_info[i].logical_address); (unsigned int) dataflash_info[i].logical_address);
for (j=0; j< NB_DATAFLASH_AREA; j++) { for (j = 0; j < NB_DATAFLASH_AREA; j++) {
switch(dataflash_info[i].Device.area_list[j].protected) { switch(dataflash_info[i].Device.area_list[j].protected) {
case FLAG_PROTECT_SET: case FLAG_PROTECT_SET:
case FLAG_PROTECT_CLEAR: case FLAG_PROTECT_CLEAR:
@ -322,7 +321,7 @@ int prot_dataflash (AT91PS_DataFlash pdataFlash, unsigned long addr)
int area; int area;
/* find area */ /* find area */
for (area=0; area < NB_DATAFLASH_AREA; area++) { for (area = 0; area < NB_DATAFLASH_AREA; area++) {
if ((addr >= pdataFlash->pDevice->area_list[area].start) && if ((addr >= pdataFlash->pDevice->area_list[area].start) &&
(addr < pdataFlash->pDevice->area_list[area].end)) (addr < pdataFlash->pDevice->area_list[area].end))
break; break;
@ -360,13 +359,13 @@ int dataflash_real_protect (int flag, unsigned long start_addr,
return -1; return -1;
} }
/* find start area */ /* find start area */
for (area1=0; area1 < NB_DATAFLASH_AREA; area1++) { for (area1 = 0; area1 < NB_DATAFLASH_AREA; area1++) {
if (start_addr == dataflash_info[i].Device.area_list[area1].start) if (start_addr == dataflash_info[i].Device.area_list[area1].start)
break; break;
} }
if (area1 == NB_DATAFLASH_AREA) return -1; if (area1 == NB_DATAFLASH_AREA) return -1;
/* find end area */ /* find end area */
for (area2=0; area2 < NB_DATAFLASH_AREA; area2++) { for (area2 = 0; area2 < NB_DATAFLASH_AREA; area2++) {
if (end_addr == dataflash_info[i].Device.area_list[area2].end) if (end_addr == dataflash_info[i].Device.area_list[area2].end)
break; break;
} }
@ -374,7 +373,7 @@ int dataflash_real_protect (int flag, unsigned long start_addr,
return -1; return -1;
/*set protection value*/ /*set protection value*/
for(j = area1; j < area2+1 ; j++) for(j = area1; j < area2 + 1 ; j++)
if(dataflash_info[i].Device.area_list[j].protected if(dataflash_info[i].Device.area_list[j].protected
!= FLAG_PROTECT_INVALID) { != FLAG_PROTECT_INVALID) {
if (flag == 0) { if (flag == 0) {
@ -386,7 +385,7 @@ int dataflash_real_protect (int flag, unsigned long start_addr,
} }
} }
return (area2-area1+1); return (area2 - area1 + 1);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

2
include/configs/at91rm9200dk.h
View File

@ -1,7 +1,7 @@
/* /*
* Rick Bronson <rick@efn.org> * Rick Bronson <rick@efn.org>
* *
* Configuation settings for the AT91RM9200DK board. * Configuration settings for the AT91RM9200DK board.
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
* project. * project.