Blackfin: drop old u-boot.lds clean target

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

diff --git a/board/lart/flash.c b/board/lart/flash.c
index 89ab62c536575ee0390d301bfd7317befd0616ce..29a331eff790cce3d8026719e571940792a302d2 100644 (file)
--- a/board/lart/flash.c
+++ b/board/lart/flash.c
@@ -41,7 +41,7 @@ extern u32 data_to_flash(u32);
 #define PUZZLE_FROM_FLASH(x)   data_from_flash((x))
 #define PUZZLE_TO_FLASH(x)     data_to_flash((x))
 
-flash_info_t    flash_info[CFG_MAX_FLASH_BANKS];
+flash_info_t    flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
 
 
 #define CMD_READ_ARRAY         0x00FF00FF
@@ -74,19 +74,19 @@ ulong flash_init(void)
     int i, j;
     ulong size = 0;
 
-    for (i = 0; i < CFG_MAX_FLASH_BANKS; i++)
+    for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++)
     {
        ulong flashbase = 0;
        flash_info[i].flash_id =
          (INTEL_MANUFACT & FLASH_VENDMASK) |
          (INTEL_ID_28F160F3B & FLASH_TYPEMASK);
        flash_info[i].size = FLASH_BANK_SIZE;
-       flash_info[i].sector_count = CFG_MAX_FLASH_SECT;
-       memset(flash_info[i].protect, 0, CFG_MAX_FLASH_SECT);
+       flash_info[i].sector_count = CONFIG_SYS_MAX_FLASH_SECT;
+       memset(flash_info[i].protect, 0, CONFIG_SYS_MAX_FLASH_SECT);
        if (i == 0)
          flashbase = PHYS_FLASH_1;
        else
-         panic("configured to many flash banks!\n");
+         panic("configured too many flash banks!\n");
        for (j = 0; j < flash_info[i].sector_count; j++)
        {
            if (j <= 7)
@@ -104,13 +104,13 @@ ulong flash_init(void)
     /* Protect monitor and environment sectors
      */
     flash_protect(FLAG_PROTECT_SET,
-                 CFG_FLASH_BASE,
-                 CFG_FLASH_BASE + monitor_flash_len - 1,
+                 CONFIG_SYS_FLASH_BASE,
+                 CONFIG_SYS_FLASH_BASE + monitor_flash_len - 1,
                  &flash_info[0]);
 
     flash_protect(FLAG_PROTECT_SET,
-                 CFG_ENV_ADDR,
-                 CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+                 CONFIG_ENV_ADDR,
+                 CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
                  &flash_info[0]);
 
     return size;
@@ -159,6 +159,7 @@ void flash_print_info  (flash_info_t *info)
     printf ("\n");
 
 Done:
+    ;
 }
 
 /*-----------------------------------------------------------------------
@@ -304,7 +305,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
            do
            {
                /* check timeout */
-               if (get_timer_masked() > CFG_FLASH_ERASE_TOUT)
+               if (get_timer_masked() > CONFIG_SYS_FLASH_ERASE_TOUT)
                {
                    *addr = PUZZLE_TO_FLASH(CMD_SUSPEND);
                    result = BIT_TIMEOUT;
@@ -317,7 +318,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
            *addr = PUZZLE_TO_FLASH(CMD_READ_ARRAY);
 
            if ((rc = flash_error(result)) != ERR_OK)
-               goto outahere;
+               goto outahere;
 
            printf("ok.\n");
        }
@@ -347,7 +348,7 @@ outahere:
  * Copy memory to flash
  */
 
-volatile static int write_word (flash_info_t *info, ulong dest, ulong data)
+static int write_word (flash_info_t *info, ulong dest, ulong data)
 {
     vu_long *addr = (vu_long *)dest;
     ulong result;
@@ -358,7 +359,7 @@ volatile static int write_word (flash_info_t *info, ulong dest, ulong data)
      */
     result = PUZZLE_FROM_FLASH(*addr);
     if ((result & data) != data)
-        return ERR_NOT_ERASED;
+       return ERR_NOT_ERASED;
 
     /*
      * Disable interrupts which might cause a timeout
@@ -382,7 +383,7 @@ volatile static int write_word (flash_info_t *info, ulong dest, ulong data)
     do
     {
        /* check timeout */
-       if (get_timer_masked() > CFG_FLASH_ERASE_TOUT)
+       if (get_timer_masked() > CONFIG_SYS_FLASH_ERASE_TOUT)
        {
            *addr = PUZZLE_TO_FLASH(CMD_SUSPEND);
            result = BIT_TIMEOUT;