Merge with git://www.denx.de/git/u-boot.git

[oweals/u-boot.git] / board / rsdproto / flash.c

diff --git a/board/rsdproto/flash.c b/board/rsdproto/flash.c
index 654012f607c673a8e910cef610fb1fef0cb181b0..5ad3218520d589344d8bfda9003165316707348c 100644 (file)
--- a/board/rsdproto/flash.c
+++ b/board/rsdproto/flash.c
@@ -59,9 +59,9 @@ static unsigned char write_ull(flash_info_t *info,
 
 /* from flash_asm.S */
 extern void ull_write(unsigned long long volatile *address,
-                      unsigned long long volatile *data);
+                     unsigned long long volatile *data);
 extern void ull_read(unsigned long long volatile *address,
-                     unsigned long long volatile *data);
+                    unsigned long long volatile *data);
 
 /*-----------------------------------------------------------------------
  */
@@ -123,11 +123,11 @@ unsigned long flash_init (void)
 #if CFG_MONITOR_BASE >= PHYS_FLASH
        flash_protect(FLAG_PROTECT_SET,
                      CFG_MONITOR_BASE,
-                     CFG_MONITOR_BASE+CFG_MONITOR_LEN-1,
+                     CFG_MONITOR_BASE+monitor_flash_len-1,
                      &flash_info[0]);
        flash_protect(FLAG_PROTECT_SET,
                      CFG_MONITOR_BASE,
-                     CFG_MONITOR_BASE+CFG_MONITOR_LEN-1,
+                     CFG_MONITOR_BASE+monitor_flash_len-1,
                      &flash_info[1]);
 #endif
 
@@ -268,7 +268,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
                        ull_write(f_addr, &f_command);
                        printf (" timeout\n");
                        return 1;
-        }
+       }
        } while(*f_addr != 0xFFFFFFFFFFFFFFFFULL);
 
     printf (" done\n");