rename CFG_ macros to CONFIG_SYS

[platform/kernel/u-boot.git] / board / stxssa / stxssa.c

diff --git a/board/stxssa/stxssa.c b/board/stxssa/stxssa.c
index 4d4dc06..73dddf3 100644 (file)
--- a/board/stxssa/stxssa.c
+++ b/board/stxssa/stxssa.c
@@ -207,7 +207,7 @@ reset_phy(void)
 #if 0
        int     i;
 #endif
-       blatch = (volatile uint *)CFG_LBC_CFGLATCH_BASE;
+       blatch = (volatile uint *)CONFIG_SYS_LBC_CFGLATCH_BASE;
 
        /* reset Giga bit Ethernet port if needed here */
 
@@ -253,7 +253,7 @@ int
 board_early_init_f(void)
 {
 #if defined(CONFIG_PCI)
-       volatile ccsr_pcix_t *pci = (void *)(CFG_MPC85xx_PCIX_ADDR);
+       volatile ccsr_pcix_t *pci = (void *)(CONFIG_SYS_MPC85xx_PCIX_ADDR);
 
        pci->peer &= 0xffffffdf; /* disable master abort */
 #endif
@@ -284,7 +284,7 @@ show_activity(int flag)
        if (next_led_update > get_ticks())
                return;
 
-       blatch = (volatile uint *)CFG_LBC_CFGLATCH_BASE;
+       blatch = (volatile uint *)CONFIG_SYS_LBC_CFGLATCH_BASE;
 
        led_bit >>= 1;
        if (led_bit == 0)
@@ -301,7 +301,7 @@ initdram (int board_type)
 
 #if defined(CONFIG_DDR_DLL)
        {
-               volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR);
+               volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
                uint temp_ddrdll = 0;
 
                /* Work around to stabilize DDR DLL */
@@ -325,11 +325,11 @@ initdram (int board_type)
 }
 
 
-#if defined(CFG_DRAM_TEST)
+#if defined(CONFIG_SYS_DRAM_TEST)
 int testdram (void)
 {
-       uint *pstart = (uint *) CFG_MEMTEST_START;
-       uint *pend = (uint *) CFG_MEMTEST_END;
+       uint *pstart = (uint *) CONFIG_SYS_MEMTEST_START;
+       uint *pend = (uint *) CONFIG_SYS_MEMTEST_END;
        uint *p;
 
        printf("SDRAM test phase 1:\n");