cfi_flash: Simplify dynamic flash bank number detection

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

diff --git a/board/ep8260/flash.c b/board/ep8260/flash.c
index 278d606b321c79b07c4e24b0afbbbe66d3a18c9c..2a81de570ca134c6f2dde91e78b0000241f4f92d 100644 (file)
--- a/board/ep8260/flash.c
+++ b/board/ep8260/flash.c
@@ -35,7 +35,7 @@
 #define V_BYTE(a)      (*(volatile unsigned char *)( a ))
 
 
-flash_info_t flash_info[CFG_MAX_FLASH_BANKS];
+flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
 
 
 /*-----------------------------------------------------------------------
@@ -72,7 +72,7 @@ ulong flash_get_size( ulong baseaddr, flash_info_t *info )
                info->flash_id = FLASH_UNKNOWN;
                info->sector_count = 0;
                info->size = 0;
-               return (0);                             /* no or unknown flash     */
+               return (0);                             /* no or unknown flash     */
        }
 
        flashtest_h = V_ULONG(baseaddr + 8);            /* device ID               */
@@ -91,11 +91,11 @@ ulong flash_get_size( ulong baseaddr, flash_info_t *info )
        case AMD_ID_LV640U:     /* AMDLV640 and AMDLV641 have same ID */
                info->flash_id += FLASH_AMLV640U;
                info->sector_count = 128;
-               info->size = 0x02000000;        /* 4 * 8 MB = 32 MB     */
+               info->size = 0x02000000;        /* 4 * 8 MB = 32 MB     */
                break;
        default:
                info->flash_id = FLASH_UNKNOWN;
-               return(0);                              /* no or unknown flash     */
+               return(0);                              /* no or unknown flash     */
        }
 
        if(flashtest_h == AMD_ID_LV640U) {
@@ -134,13 +134,13 @@ unsigned long flash_init (void)
        int i;
 
        /* 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;
        }
 
        /* Static FLASH Bank configuration here (only one bank) */
 
-       size_b0 = flash_get_size(CFG_FLASH0_BASE, &flash_info[0]);
+       size_b0 = flash_get_size(CONFIG_SYS_FLASH0_BASE, &flash_info[0]);
        if (flash_info[0].flash_id == FLASH_UNKNOWN || size_b0 == 0) {
                printf ("## Unknown FLASH on Bank 0 - Size = 0x%08lx = %ld MB\n",
                        size_b0, size_b0>>20);
@@ -150,20 +150,20 @@ unsigned long flash_init (void)
         * protect monitor and environment sectors
         */
 
-#if CFG_MONITOR_BASE >= CFG_FLASH0_BASE
+#if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH0_BASE
        flash_protect(FLAG_PROTECT_SET,
-                     CFG_MONITOR_BASE,
-                     CFG_MONITOR_BASE+monitor_flash_len-1,
+                     CONFIG_SYS_MONITOR_BASE,
+                     CONFIG_SYS_MONITOR_BASE+monitor_flash_len-1,
                      &flash_info[0]);
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR)
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE      CONFIG_ENV_SECT_SIZE
 # endif
        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]);
 #endif
 
@@ -284,7 +284,7 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
        while ((V_ULONG( info->start[l_sect] ) & 0x00800080) != 0x00800080 ||
               (V_ULONG( info->start[l_sect] + 4 ) & 0x00800080) != 0x00800080)
        {
-               if ((now = get_timer(start)) > CFG_FLASH_ERASE_TOUT) {
+               if ((now = get_timer(start)) > CONFIG_SYS_FLASH_ERASE_TOUT) {
                        printf ("Timeout\n");
                        return 1;
                }
@@ -403,7 +403,7 @@ static int write_dword (flash_info_t *info, ulong dest, unsigned char * pdata)
        start = get_timer (0);
        while (((V_ULONG( dest ) & 0x00800080) != (ch & 0x00800080)) ||
               ((V_ULONG( dest + 4 ) & 0x00800080) != (cl & 0x00800080))) {
-               if (get_timer(start) > CFG_FLASH_WRITE_TOUT) {
+               if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
                        return (1);
                }
        }