rename CFG_ macros to CONFIG_SYS

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

diff --git a/board/tqc/tqm8260/flash.c b/board/tqc/tqm8260/flash.c
index 063972db5bbcff4df30c01b4a2b5ae14a6f2414b..4a6d5382bed73c236fa19fe8f9b65c1855e8e5a6 100644 (file)
--- a/board/tqc/tqm8260/flash.c
+++ b/board/tqc/tqm8260/flash.c
@@ -31,7 +31,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];
 
 
 /*-----------------------------------------------------------------------
@@ -185,13 +185,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);
@@ -201,19 +201,19 @@ 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, &flash_info[0]);
+                      CONFIG_SYS_MONITOR_BASE,
+                      CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1, &flash_info[0]);
 #endif
 
-#if defined(CFG_ENV_IS_IN_FLASH) && 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, &flash_info[0]);
+                      CONFIG_ENV_ADDR,
+                      CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
 #endif
 
        return (size_b0);
@@ -364,7 +364,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;
                }
@@ -480,7 +480,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);
                }
        }