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

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

diff --git a/board/g2000/strataflash.c b/board/g2000/strataflash.c
index 06fedeccd3a377421b6bb6d6a67f9032cd8f2684..effe65a36f86567b9cc0b3da2d7aba4d1a2f232b 100644 (file)
--- a/board/g2000/strataflash.c
+++ b/board/g2000/strataflash.c
@@ -85,12 +85,8 @@
 #define FLASH_OFFSET_USER_PROTECTION    0x85
 #define FLASH_OFFSET_INTEL_PROTECTION   0x81
 
-
 #define FLASH_MAN_CFI                  0x01000000
 
-
-
-
 typedef union {
        unsigned char c;
        unsigned short w;
@@ -105,15 +101,12 @@ typedef union {
 
 #define NUM_ERASE_REGIONS 4
 
-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 */
 
 /*-----------------------------------------------------------------------
  * Functions
  */
 
-
-
 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);
@@ -123,7 +116,7 @@ static int flash_detect_cfi(flash_info_t * info);
 static ulong flash_get_size (ulong base, int banknum);
 static int flash_write_cfiword (flash_info_t *info, ulong dest, cfiword_t cword);
 static int flash_full_status_check(flash_info_t * info, ulong sector, ulong tout, char * prompt);
-#ifdef CFG_FLASH_USE_BUFFER_WRITE
+#ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 static int flash_write_cfibuffer(flash_info_t * info, ulong dest, uchar * cp, int len);
 #endif
 /*-----------------------------------------------------------------------
@@ -183,14 +176,14 @@ unsigned long flash_init (void)
         *
         */
 
-       address = CFG_FLASH_BASE;
+       address = CONFIG_SYS_FLASH_BASE;
        size = 0;
 
        /* Init: no FLASHes known */
-       for (i=0; i<CFG_MAX_FLASH_BANKS; ++i) {
+       for (i=0; i<CONFIG_SYS_MAX_FLASH_BANKS; ++i) {
                flash_info[i].flash_id = FLASH_UNKNOWN;
                size += flash_info[i].size = flash_get_size(address, i);
-               address += CFG_FLASH_INCREMENT;
+               address += CONFIG_SYS_FLASH_INCREMENT;
                if (flash_info[0].flash_id == FLASH_UNKNOWN) {
                        printf ("## Unknown FLASH on Bank %d - Size = 0x%08lx = %ld MB\n",i,
                                flash_info[0].size, flash_info[i].size<<20);
@@ -199,14 +192,14 @@ unsigned long flash_init (void)
 
 #if 0 /* test-only */
        /* 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++)
+#if (CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE)
+       for(i=0; flash_info[0].start[i] < CONFIG_SYS_MONITOR_BASE+CONFIG_SYS_MONITOR_LEN-1; i++)
                (void)flash_real_protect(&flash_info[0], i, 1);
 #endif
 #else
        /* monitor protection ON by default */
        flash_protect (FLAG_PROTECT_SET,
-                      - CFG_MONITOR_LEN,
+                      - CONFIG_SYS_MONITOR_LEN,
                       - 1, &flash_info[1]);
 #endif
 
@@ -280,34 +273,34 @@ void flash_print_info  (flash_info_t *info)
 
        printf ("  Sector Start Addresses:");
        for (i=0; i<info->sector_count; ++i) {
-#ifdef CFG_FLASH_EMPTY_INFO
+#ifdef CONFIG_SYS_FLASH_EMPTY_INFO
                int k;
                int size;
                int erased;
                volatile unsigned long *flash;
 
-                /*
-                 * Check if whole sector is erased
-                 */
-                if (i != (info->sector_count-1))
-                  size = info->start[i+1] - info->start[i];
-                else
-                  size = info->start[0] + info->size - info->start[i];
-                erased = 1;
-                flash = (volatile unsigned long *)info->start[i];
-                size = size >> 2;        /* divide by 4 for longword access */
-                for (k=0; k<size; k++)
-                  {
-                    if (*flash++ != 0xffffffff)
-                      {
-                        erased = 0;
-                        break;
-                      }
-                  }
+               /*
+                * Check if whole sector is erased
+                */
+               if (i != (info->sector_count-1))
+                 size = info->start[i+1] - info->start[i];
+               else
+                 size = info->start[0] + info->size - info->start[i];
+               erased = 1;
+               flash = (volatile unsigned long *)info->start[i];
+               size = size >> 2;        /* divide by 4 for longword access */
+               for (k=0; k<size; k++)
+                 {
+                   if (*flash++ != 0xffffffff)
+                     {
+                       erased = 0;
+                       break;
+                     }
+                 }
 
                if ((i % 5) == 0)
                        printf ("\n   ");
-                /* print empty and read-only info */
+               /* print empty and read-only info */
                printf (" %08lX%s%s",
                        info->start[i],
                        erased ? " E" : "  ",
@@ -360,7 +353,7 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
                wp = cp;
        }
 
-#ifdef CFG_FLASH_USE_BUFFER_WRITE
+#ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
        while(cnt >= info->portwidth) {
                i = info->buffer_size > cnt? cnt: info->buffer_size;
                if((rc = flash_write_cfibuffer(info, wp, src,i)) != ERR_OK)
@@ -381,7 +374,7 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
                wp += info->portwidth;
                cnt -= info->portwidth;
        }
-#endif /* CFG_FLASH_USE_BUFFER_WRITE */
+#endif /* CONFIG_SYS_FLASH_USE_BUFFER_WRITE */
        if (cnt == 0) {
                return (0);
        }
@@ -464,7 +457,7 @@ static int flash_full_status_check(flash_info_t * info, ulong sector, ulong tout
                        printf("Command Sequence Error.\n");
                } else if(flash_isset(info, sector, 0, FLASH_STATUS_ECLBS)){
                        printf("Block Erase Error.\n");
-                       retcode = ERR_NOT_ERASED;
+                       retcode = ERR_NOT_ERASED;
                } else if (flash_isset(info, sector, 0, FLASH_STATUS_PSLBS)) {
                        printf("Locking Error\n");
                }
@@ -723,7 +716,7 @@ static int flash_write_cfiword (flash_info_t *info, ulong dest, cfiword_t cword)
        return flash_full_status_check(info, 0, info->write_tout, "write");
 }
 
-#ifdef CFG_FLASH_USE_BUFFER_WRITE
+#ifdef CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 
 /* loop through the sectors from the highest address
  * when the passed address is greater or equal to the sector address
@@ -797,4 +790,4 @@ static int flash_write_cfibuffer(flash_info_t * info, ulong dest, uchar * cp, in
        flash_write_cmd(info, sector, 0, FLASH_CMD_CLEAR_STATUS);
        return retcode;
 }
-#endif /* CFG_USE_FLASH_BUFFER_WRITE */
+#endif /* CONFIG_SYS_USE_FLASH_BUFFER_WRITE */