rename CFG_ macros to CONFIG_SYS

[oweals/u-boot.git] / board / esteem192e / flash.c

diff --git a/board/esteem192e/flash.c b/board/esteem192e/flash.c
index d5eb2019b603eb00d1df892179b80c3c803b3f03..cce73fa7be6f65df31553c2af7159b88ca725cc5 100644 (file)
--- a/board/esteem192e/flash.c
+++ b/board/esteem192e/flash.c
@@ -24,7 +24,7 @@
 #include <common.h>
 #include <mpc8xx.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        */
 
 #ifdef CONFIG_FLASH_16BIT
 #define FLASH_WORD_SIZE        unsigned short
@@ -54,13 +54,13 @@ static void flash_get_offsets (ulong base, flash_info_t * info);
  */
 unsigned long flash_init (void)
 {
-       volatile immap_t *immap = (immap_t *) CFG_IMMR;
+       volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
        volatile memctl8xx_t *memctl = &immap->im_memctl;
        unsigned long size_b0, size_b1;
        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;
        }
 
@@ -91,44 +91,44 @@ unsigned long flash_init (void)
        }
 
        /* Remap FLASH according to real size */
-       memctl->memc_or0 = CFG_OR_TIMING_FLASH | (-size_b0 & 0xFFFF8000);
-       memctl->memc_br0 = CFG_FLASH_BASE | 0x00000801; /*  (CFG_FLASH_BASE & BR_BA_MSK) | BR_MS_GPCM | BR_V; */
+       memctl->memc_or0 = CONFIG_SYS_OR_TIMING_FLASH | (-size_b0 & 0xFFFF8000);
+       memctl->memc_br0 = CONFIG_SYS_FLASH_BASE | 0x00000801;  /*  (CONFIG_SYS_FLASH_BASE & BR_BA_MSK) | BR_MS_GPCM | BR_V; */
 
        /* Re-do sizing to get full correct info */
 
-       size_b0 = flash_get_size ((volatile FLASH_WORD_SIZE *) CFG_FLASH_BASE,
+       size_b0 = flash_get_size ((volatile FLASH_WORD_SIZE *) CONFIG_SYS_FLASH_BASE,
                                  &flash_info[0]);
-       flash_get_offsets (CFG_FLASH_BASE, &flash_info[0]);
+       flash_get_offsets (CONFIG_SYS_FLASH_BASE, &flash_info[0]);
 
-#if CFG_MONITOR_BASE >= CFG_FLASH_BASE
+#if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE
        /* monitor protection ON by default */
        (void) 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 (size_b1) {
                memctl->memc_or1 =
-                       CFG_OR_TIMING_FLASH | (-size_b1 & 0xFFFF8000);
+                       CONFIG_SYS_OR_TIMING_FLASH | (-size_b1 & 0xFFFF8000);
                memctl->memc_br1 =
-                       (CFG_FLASH_BASE | 0x00000801) + (size_b0 & BR_BA_MSK);
-               /*((CFG_FLASH_BASE + size_b0) & BR_BA_MSK) |
+                       (CONFIG_SYS_FLASH_BASE | 0x00000801) + (size_b0 & BR_BA_MSK);
+               /*((CONFIG_SYS_FLASH_BASE + size_b0) & BR_BA_MSK) |
                   BR_MS_GPCM | BR_V; */
 
                /* Re-do sizing to get full correct info */
                size_b1 =
                        flash_get_size ((volatile FLASH_WORD_SIZE
-                                        *) (CFG_FLASH_BASE + size_b0),
+                                        *) (CONFIG_SYS_FLASH_BASE + size_b0),
                                        &flash_info[1]);
 
-               flash_get_offsets (CFG_FLASH_BASE + size_b0, &flash_info[1]);
+               flash_get_offsets (CONFIG_SYS_FLASH_BASE + size_b0, &flash_info[1]);
 
-#if CFG_MONITOR_BASE >= CFG_FLASH_BASE
+#if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE
                /* monitor protection ON by default */
                (void) flash_protect (FLAG_PROTECT_SET,
-                                     CFG_MONITOR_BASE,
-                                     CFG_MONITOR_BASE + monitor_flash_len -
+                                     CONFIG_SYS_MONITOR_BASE,
+                                     CONFIG_SYS_MONITOR_BASE + monitor_flash_len -
                                      1, &flash_info[1]);
 #endif
        } else {
@@ -769,7 +769,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
                addr = (volatile FLASH_WORD_SIZE *) (info->start[l_sect]);
                while ((addr[0] & (0x00800080 & FLASH_ID_MASK)) !=
                       (0x00800080 & FLASH_ID_MASK)) {
-                       if ((now = get_timer (start)) > CFG_FLASH_ERASE_TOUT) {
+                       if ((now = get_timer (start)) > CONFIG_SYS_FLASH_ERASE_TOUT) {
                                printf ("Timeout\n");
                                return 1;
                        }
@@ -1022,7 +1022,7 @@ static int write_word (flash_info_t * info, ulong dest, ulong data)
 
                while ((*((vu_long *) dest) & 0x00800080) !=
                       (data & 0x00800080)) {
-                       if (get_timer (start) > CFG_FLASH_WRITE_TOUT) {
+                       if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
                                return (1);
                        }
                }
@@ -1030,7 +1030,7 @@ static int write_word (flash_info_t * info, ulong dest, ulong data)
        } else {
 
                while (!(addr[0] & 0x00800080)) {       /* wait for error or finish */
-                       if (get_timer (start) > CFG_FLASH_WRITE_TOUT) {
+                       if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
                                return (1);
                        }
 
@@ -1096,7 +1096,7 @@ static int write_short (flash_info_t * info, ulong dest, ushort data)
        if (info->flash_id < FLASH_AMD_COMP) {
                /* AMD stuff */
                while ((*((vu_short *) dest) & 0x0080) != (data & 0x0080)) {
-                       if (get_timer (start) > CFG_FLASH_WRITE_TOUT) {
+                       if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
                                return (1);
                        }
                }
@@ -1104,7 +1104,7 @@ static int write_short (flash_info_t * info, ulong dest, ushort data)
        } else {
                /* intel stuff */
                while (!(addr[0] & 0x0080)) {   /* wait for error or finish */
-                       if (get_timer (start) > CFG_FLASH_WRITE_TOUT)
+                       if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT)
                                return (1);
                }
 
@@ -1123,7 +1123,7 @@ static int write_short (flash_info_t * info, ulong dest, ushort data)
                *addr = 0x00B0;
                *addr = 0x0070;
                while (!(addr[0] & 0x0080)) {   /* wait for error or finish */
-                       if (get_timer (start) > CFG_FLASH_WRITE_TOUT)
+                       if (get_timer (start) > CONFIG_SYS_FLASH_WRITE_TOUT)
                                return (1);
                }
                *addr = 0x00FF;