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

diff --git a/cpu/arm920t/start.S b/cpu/arm920t/start.S
index 5143cfc64efdebb16e29c095d0c5506949d9af14..fbcfe6dbc39d941242c6323702c28e6618f9a639 100644 (file)
--- a/cpu/arm920t/start.S
+++ b/cpu/arm920t/start.S
@@ -118,7 +118,7 @@ start_code:
        bl coloured_LED_init
        bl red_LED_on
 
-#if    defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK) || defined(CONFIG_AT91RM9200DF)
+#if    defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK)
        /*
         * relocate exception table
         */
@@ -258,7 +258,7 @@ cpu_init_crit:
         * find a lowlevel_init.S in your board directory.
         */
        mov     ip, lr
-#if    defined(CONFIG_AT91RM9200EK) || defined(CONFIG_AT91RM9200DF)
+#if    defined(CONFIG_AT91RM9200EK)
 
 #else
        bl      lowlevel_init

diff --git a/drivers/mtd/dataflash.c b/drivers/mtd/dataflash.c
index 201e5180bdc8599c5bd1a0af759534eb05af9909..96cd395e71a7ad30ab230cc1b56f040e3bcc0e7c 100644 (file)
--- a/drivers/mtd/dataflash.c
+++ b/drivers/mtd/dataflash.c
@@ -131,14 +131,14 @@ int AT91F_DataflashInit (void)
                        break;
                }
                /* 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_size)-1;
+                               dataflash_info[i].Device.pages_size) - 1;
 
                part = 0;
                last_part = 0;
                /* set the area addresses */
-               for(j = 0; j<NB_DATAFLASH_AREA; j++) {
+               for(j = 0; j < NB_DATAFLASH_AREA; j++) {
                        if(found[i]!=0) {
                                dataflash_info[i].Device.area_list[j].start =
                                        area_list[part].start +
@@ -146,7 +146,7 @@ int AT91F_DataflashInit (void)
                                if(area_list[part].end == 0xffffffff) {
                                        dataflash_info[i].Device.area_list[j].end =
                                                dataflash_info[i].end_address +
-                                               dataflash_info  [i].logical_address;
+                                               dataflash_info[i].logical_address;
                                        last_part = 1;
                                } else {
                                        dataflash_info[i].Device.area_list[j].end =
@@ -180,12 +180,11 @@ void AT91F_DataflashSetEnv (void)
        unsigned long start;
 
        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;
                        /* Set the environment according to the label...*/
                        if((env & FLAG_SETENV) == FLAG_SETENV) {
-                               start =
-                               dataflash_info[i].Device.area_list[j].start;
+                               start = dataflash_info[i].Device.area_list[j].start;
                                sprintf((char*) s,"%lX",start);
                                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 *
                                dataflash_info[i].Device.pages_size,
                                (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) {
                                case    FLAG_PROTECT_SET:
                                case    FLAG_PROTECT_CLEAR:
@@ -322,7 +321,7 @@ int prot_dataflash (AT91PS_DataFlash pdataFlash, unsigned long addr)
        int 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) &&
                        (addr < pdataFlash->pDevice->area_list[area].end))
                        break;
@@ -360,13 +359,13 @@ int dataflash_real_protect (int flag, unsigned long start_addr,
                return -1;
        }
        /* 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)
                        break;
        }
        if (area1 == NB_DATAFLASH_AREA) return -1;
        /* 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)
                        break;
        }
@@ -374,7 +373,7 @@ int dataflash_real_protect (int flag, unsigned long start_addr,
                return -1;
 
        /*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
                                != FLAG_PROTECT_INVALID) {
                        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);
 }
 
 /*---------------------------------------------------------------------------*/

diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h
index 5c239d7bf74a6e28308b8978ecd198860b81a893..746f0ef102e181d1fad998a74612c3d1d59f3a04 100644 (file)
--- a/include/configs/at91rm9200dk.h
+++ b/include/configs/at91rm9200dk.h
@@ -1,7 +1,7 @@
 /*
  * 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
  * project.