Merge branch 'next' of ../next

[karo-tx-uboot.git] / board / dnp1110 / flash.c

diff --git a/board/dnp1110/flash.c b/board/dnp1110/flash.c
index f4a8b999c6186e9117b61b024c69897fa068112c..c81abc50fd20eb4caa082fb74a16ba6d4def4904 100644 (file)
--- a/board/dnp1110/flash.c
+++ b/board/dnp1110/flash.c
@@ -28,7 +28,7 @@
 #include <linux/byteorder/swab.h>
 
 
-flash_info_t   flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips        */
+flash_info_t   flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */
 
 /* Board support for 1 or 2 flash devices */
 #undef FLASH_PORT_WIDTH32
@@ -65,31 +65,31 @@ unsigned long flash_init (void)
    int i;
     ulong size = 0;
 
-    for (i = 0; i < CFG_MAX_FLASH_BANKS; i++)
+    for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++)
     {
-        switch (i)
-        {
-           case 0:
-            flash_get_size((FPW *)PHYS_FLASH_1, &flash_info[i]);
-                flash_get_offsets(PHYS_FLASH_1, &flash_info[i]);
-                break;
-           default:
-               panic("configured to many flash banks!\n");
-                break;
-        }
+       switch (i)
+       {
+          case 0:
+           flash_get_size((FPW *)PHYS_FLASH_1, &flash_info[i]);
+                flash_get_offsets(PHYS_FLASH_1, &flash_info[i]);
+               break;
+          default:
+               panic("configured too many flash banks!\n");
+               break;
+       }
        size += flash_info[i].size;
     }
 
     /* 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;
@@ -122,7 +122,7 @@ void flash_print_info  (flash_info_t *info)
        if (info->flash_id == FLASH_UNKNOWN) {
                printf ("missing or unknown FLASH type\n");
                return;
-        }
+       }
 
        switch (info->flash_id & FLASH_VENDMASK) {
                case FLASH_MAN_INTEL:   printf ("INTEL ");              break;
@@ -133,21 +133,21 @@ void flash_print_info  (flash_info_t *info)
    case FLASH_28F128J3A:
                                printf ("28F128J3A\n"); break;
        default:                printf ("Unknown Chip Type\n"); break;
-        }
+       }
 
        printf ("  Size: %ld MB in %d Sectors\n",
-               info->size >> 20, info->sector_count);
+               info->size >> 20, info->sector_count);
 
        printf ("  Sector Start Addresses:");
        for (i=0; i<info->sector_count; ++i) {
-               if ((i % 5) == 0)
-               printf ("\n   ");
+               if ((i % 5) == 0)
+               printf ("\n   ");
                printf (" %08lX%s",
                        info->start[i],
                        info->protect[i] ? " (RO)" : "     "
                );
-        }
-        printf ("\n");
+       }
+       printf ("\n");
        return;
 }
 
@@ -164,7 +164,7 @@ static ulong flash_get_size (FPW *addr, flash_info_t *info)
 
    mb();
        value = addr[0];
-       
+
    switch (value) {
 
    case (FPW)INTEL_MANUFACT:
@@ -194,10 +194,10 @@ static ulong flash_get_size (FPW *addr, flash_info_t *info)
                break;
        }
 
-       if (info->sector_count > CFG_MAX_FLASH_SECT) {
+       if (info->sector_count > CONFIG_SYS_MAX_FLASH_SECT) {
                printf ("** ERROR: sector count %d > max (%d) **\n",
-                       info->sector_count, CFG_MAX_FLASH_SECT);
-               info->sector_count = CFG_MAX_FLASH_SECT;
+                       info->sector_count, CONFIG_SYS_MAX_FLASH_SECT);
+               info->sector_count = CONFIG_SYS_MAX_FLASH_SECT;
     }
 
        addr[0] = (FPW)0x00FF00FF;      /* restore read mode */
@@ -267,7 +267,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
                        *addr = (FPW)0x00D000D0;        /* erase confirm */
 
                        while (((status = *addr) & (FPW)0x00800080) != (FPW)0x00800080) {
-               if (get_timer_masked() > CFG_FLASH_ERASE_TOUT) {
+               if (get_timer_masked() > CONFIG_SYS_FLASH_ERASE_TOUT) {
                                        printf ("Timeout\n");
                                        *addr = (FPW)0x00B000B0; /* suspend erase         */
                                        *addr = (FPW)0x00FF00FF; /* reset to read mode */
@@ -280,8 +280,8 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
                        *addr = (FPW)0x00FF00FF; /* resest to read mode          */
 
                        printf (" done\n");
-        }
-        }
+       }
+       }
        return rcode;
 }
 
@@ -350,7 +350,7 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
                cnt -= port_width;
                if (count++ > 0x800)
                {
-         spin_wheel();
+        spin_wheel();
                        count = 0;
                }
     }
@@ -402,7 +402,7 @@ static int write_data (flash_info_t *info, ulong dest, FPW data)
 
        /* wait while polling the status register */
        while (((status = *addr) & (FPW)0x00800080) != (FPW)0x00800080) {
-               if (get_timer_masked() > CFG_FLASH_WRITE_TOUT) {
+               if (get_timer_masked() > CONFIG_SYS_FLASH_WRITE_TOUT) {
                        *addr = (FPW)0x00FF00FF;        /* restore read mode */
                        return (1);
                }
@@ -422,4 +422,3 @@ spin_wheel(void)
    printf("\010%c", w[p]);
    (++p == 3) ? (p = 0) : 0;
 }
-