Merge with /home/git/u-boot

[u-boot] / board / ppmc8260 / strataflash.c

diff --git a/board/ppmc8260/strataflash.c b/board/ppmc8260/strataflash.c
index bb2184895bdccc2b1acc34bdf1e856e078b6b6f8..f9abfac73f9009ea2cdd2a36f6e3239d04145e39 100644 (file)
--- a/board/ppmc8260/strataflash.c
+++ b/board/ppmc8260/strataflash.c
@@ -90,8 +90,6 @@
 #define FLASH_MAN_CFI                  0x01000000
 
 
-
-
 typedef union {
        unsigned char c;
        unsigned short w;
@@ -114,7 +112,6 @@ flash_info_t        flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
  */
 
 
-
 static void flash_add_byte(flash_info_t *info, cfiword_t * cword, uchar c);
 static void flash_make_cmd(flash_info_t * info, uchar cmd, void * cmdbuf);
 static void flash_write_cmd(flash_info_t * info, int sect, uchar offset, uchar cmd);
@@ -201,7 +198,7 @@ unsigned long flash_init (void)
 
        /* Monitor protection ON by default */
 #if (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
-       for(i=0; flash_info[0].start[i] < CFG_MONITOR_BASE+CFG_MONITOR_LEN-1; i++)
+       for(i=0; flash_info[0].start[i] < CFG_MONITOR_BASE+monitor_flash_len-1; i++)
                (void)flash_real_protect(&flash_info[0], i, 1);
 #endif