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

[u-boot] / board / ixdp425 / flash.c

diff --git a/board/ixdp425/flash.c b/board/ixdp425/flash.c
index bd3a7055f8085b67ceac62dc7644eb0503987dc6..704dea86379c54680113ef1aad3b28e4da503b05 100644 (file)
--- a/board/ixdp425/flash.c
+++ b/board/ixdp425/flash.c
@@ -35,19 +35,19 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS];       /* info for FLASH chips        */
 #define FLASH_PORT_WIDTH16
 
 #ifdef FLASH_PORT_WIDTH16
-#define FLASH_PORT_WIDTH               ushort
-#define FLASH_PORT_WIDTHV              vu_short
-#define SWAP(x)                        x
+#define FLASH_PORT_WIDTH       ushort
+#define FLASH_PORT_WIDTHV      vu_short
+#define SWAP(x)                        x
 #else
-#define FLASH_PORT_WIDTH               ulong
-#define FLASH_PORT_WIDTHV              vu_long
-#define SWAP(x)                        __swab32(x)
+#define FLASH_PORT_WIDTH       ulong
+#define FLASH_PORT_WIDTHV      vu_long
+#define SWAP(x)                        __swab32(x)
 #endif
 
-#define FPW       FLASH_PORT_WIDTH
-#define FPWV   FLASH_PORT_WIDTHV
+#define FPW    FLASH_PORT_WIDTH
+#define FPWV   FLASH_PORT_WIDTHV
 
-#define mb() __asm__ __volatile__ ("" : : : "memory")
+#define mb()   __asm__ __volatile__ ("" : : : "memory")
 
 /*-----------------------------------------------------------------------
  * Functions
@@ -72,7 +72,7 @@ unsigned long flash_init (void)
                        flash_get_offsets (PHYS_FLASH_1, &flash_info[i]);
                        break;
                default:
-                       panic ("configured to many flash banks!\n");
+                       panic ("configured too many flash banks!\n");
                        break;
                }
                size += flash_info[i].size;
@@ -82,7 +82,7 @@ unsigned long flash_init (void)
         */
        flash_protect (FLAG_PROTECT_SET,
                       CFG_FLASH_BASE,
-                      CFG_FLASH_BASE + _armboot_end_data - _armboot_start,
+                      CFG_FLASH_BASE + _bss_start - _armboot_start,
                       &flash_info[0]);
 
        flash_protect (FLAG_PROTECT_SET,