rename CFG_ macros to CONFIG_SYS

[platform/kernel/u-boot.git] / board / amcc / ocotea / flash.c

diff --git a/board/amcc/ocotea/flash.c b/board/amcc/ocotea/flash.c
index 46c6946..a83f93a 100644 (file)
--- a/board/amcc/ocotea/flash.c
+++ b/board/amcc/ocotea/flash.c
@@ -53,9 +53,9 @@
 #define     FLASH_ONBD_N_VAL        2
 #define     FLASH_SRAM_SEL_VAL      1
 
-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        */
 
-static unsigned long flash_addr_table[8][CFG_MAX_FLASH_BANKS] = {
+static unsigned long flash_addr_table[8][CONFIG_SYS_MAX_FLASH_BANKS] = {
        {0xFF800000, 0xFF880000, 0xFFC00000},   /* 0:000: configuraton 4 */
        {0xFF900000, 0xFF980000, 0xFFC00000},   /* 1:001: configuraton 3 */
        {0x00000000, 0x00000000, 0x00000000},   /* 2:010: configuraton 8 */
@@ -83,8 +83,8 @@ static int write_word(flash_info_t * info, ulong dest, ulong data);
 unsigned long flash_init(void)
 {
        unsigned long total_b = 0;
-       unsigned long size_b[CFG_MAX_FLASH_BANKS];
-       unsigned char *fpga_base = (unsigned char *)CFG_FPGA_BASE;
+       unsigned long size_b[CONFIG_SYS_MAX_FLASH_BANKS];
+       unsigned char *fpga_base = (unsigned char *)CONFIG_SYS_FPGA_BASE;
        unsigned char switch_status;
        unsigned short index = 0;
        int i;
@@ -107,7 +107,7 @@ unsigned long flash_init(void)
        DEBUGF("FLASH: Index: %d\n", index);
 
        /* 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;
                flash_info[i].sector_count = -1;
                flash_info[i].size = 0;
@@ -131,8 +131,8 @@ unsigned long flash_init(void)
                }
 
                /* Monitor protection ON by default */
-               (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE,
-                                   CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_SYS_MONITOR_BASE,
+                                   CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN - 1,
                                    &flash_info[i]);
 #ifdef CONFIG_ENV_IS_IN_FLASH
                (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,