minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-13 22:16:45 -04:00
Code Issues Packages 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

5
drivers/mtd/dataflash.c
View File

@ -131,7 +131,7 @@ 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;
@ -184,8 +184,7 @@ void AT91F_DataflashSetEnv (void)
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);
} }

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.