rename CFG_ macros to CONFIG_SYS

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

diff --git a/board/tqc/tqm5200/tqm5200.c b/board/tqc/tqm5200/tqm5200.c
index 5152331..faa2e02 100644 (file)
--- a/board/tqc/tqm5200/tqm5200.c
+++ b/board/tqc/tqm5200/tqm5200.c
@@ -54,7 +54,7 @@ DECLARE_GLOBAL_DATA_PTR;
 void ps2mult_early_init(void);
 #endif
 
-#ifndef CFG_RAMBOOT
+#ifndef CONFIG_SYS_RAMBOOT
 static void sdram_start (int hi_addr)
 {
        long hi_addr_bit = hi_addr ? 0x01000000 : 0;
@@ -101,7 +101,7 @@ static void sdram_start (int hi_addr)
 
 /*
  * ATTENTION: Although partially referenced initdram does NOT make real use
- *           use of CFG_SDRAM_BASE. The code does not work if CFG_SDRAM_BASE
+ *           use of CONFIG_SYS_SDRAM_BASE. The code does not work if CONFIG_SYS_SDRAM_BASE
  *           is something else than 0x00000000.
  */
 
@@ -111,7 +111,7 @@ phys_size_t initdram (int board_type)
        ulong dramsize2 = 0;
        uint svr, pvr;
 
-#ifndef CFG_RAMBOOT
+#ifndef CONFIG_SYS_RAMBOOT
        ulong test1, test2;
 
        /* setup SDRAM chip selects */
@@ -132,9 +132,9 @@ phys_size_t initdram (int board_type)
 
        /* find RAM size using SDRAM CS0 only */
        sdram_start(0);
-       test1 = get_ram_size((long *)CFG_SDRAM_BASE, 0x20000000);
+       test1 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
        sdram_start(1);
-       test2 = get_ram_size((long *)CFG_SDRAM_BASE, 0x20000000);
+       test2 = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, 0x20000000);
        if (test1 > test2) {
                sdram_start(0);
                dramsize = test1;
@@ -161,10 +161,10 @@ phys_size_t initdram (int board_type)
        /* find RAM size using SDRAM CS1 only */
        if (!dramsize)
                sdram_start(0);
-       test2 = test1 = get_ram_size((long *)(CFG_SDRAM_BASE + dramsize), 0x20000000);
+       test2 = test1 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x20000000);
        if (!dramsize) {
                sdram_start(1);
-               test2 = get_ram_size((long *)(CFG_SDRAM_BASE + dramsize), 0x20000000);
+               test2 = get_ram_size((long *)(CONFIG_SYS_SDRAM_BASE + dramsize), 0x20000000);
        }
        if (test1 > test2) {
                sdram_start(0);
@@ -186,7 +186,7 @@ phys_size_t initdram (int board_type)
                *(vu_long *)MPC5XXX_SDRAM_CS1CFG = dramsize; /* disabled */
        }
 
-#else /* CFG_RAMBOOT */
+#else /* CONFIG_SYS_RAMBOOT */
 
        /* retrieve size of memory connected to SDRAM CS0 */
        dramsize = *(vu_long *)MPC5XXX_SDRAM_CS0CFG & 0xFF;
@@ -203,7 +203,7 @@ phys_size_t initdram (int board_type)
        } else {
                dramsize2 = 0;
        }
-#endif /* CFG_RAMBOOT */
+#endif /* CONFIG_SYS_RAMBOOT */
 
        /*
         * On MPC5200B we need to set the special configuration delay in the
@@ -406,7 +406,7 @@ int board_early_init_r (void)
        ps2mult_early_init();
 #endif /* CONFIG_PS2MULT */
 
-#if defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT)
+#if defined(CONFIG_USB_OHCI_NEW) && defined(CONFIG_SYS_USB_OHCI_CPU_INIT)
        /* Low level USB init, required for proper kernel operation */
        usb_cpu_init();
 #endif
@@ -464,34 +464,34 @@ int last_stage_init (void)
         */
 
        /* save original SRAM content  */
-       save = *(volatile u16 *)CFG_CS2_START;
+       save = *(volatile u16 *)CONFIG_SYS_CS2_START;
        restore = 1;
 
        /* write test pattern to SRAM */
-       *(volatile u16 *)CFG_CS2_START = 0xA5A5;
+       *(volatile u16 *)CONFIG_SYS_CS2_START = 0xA5A5;
        __asm__ volatile ("sync");
        /*
         * Put a different pattern on the data lines: otherwise they may float
         * long enough to read back what we wrote.
         */
-       tmp = *(volatile u16 *)CFG_FLASH_BASE;
+       tmp = *(volatile u16 *)CONFIG_SYS_FLASH_BASE;
        if (tmp == 0xA5A5)
                puts ("!! possible error in SRAM detection\n");
 
-       if (*(volatile u16 *)CFG_CS2_START != 0xA5A5) {
+       if (*(volatile u16 *)CONFIG_SYS_CS2_START != 0xA5A5) {
                /* no SRAM at all, disable cs */
                *(vu_long *)MPC5XXX_ADDECR &= ~(1 << 18);
                *(vu_long *)MPC5XXX_CS2_START = 0x0000FFFF;
                *(vu_long *)MPC5XXX_CS2_STOP = 0x0000FFFF;
                restore = 0;
                __asm__ volatile ("sync");
-       } else if (*(volatile u16 *)(CFG_CS2_START + (1<<19)) == 0xA5A5) {
+       } else if (*(volatile u16 *)(CONFIG_SYS_CS2_START + (1<<19)) == 0xA5A5) {
                /* make sure that we access a mirrored address */
-               *(volatile u16 *)CFG_CS2_START = 0x1111;
+               *(volatile u16 *)CONFIG_SYS_CS2_START = 0x1111;
                __asm__ volatile ("sync");
-               if (*(volatile u16 *)(CFG_CS2_START + (1<<19)) == 0x1111) {
+               if (*(volatile u16 *)(CONFIG_SYS_CS2_START + (1<<19)) == 0x1111) {
                        /* SRAM size = 512 kByte */
-                       *(vu_long *)MPC5XXX_CS2_STOP = STOP_REG(CFG_CS2_START,
+                       *(vu_long *)MPC5XXX_CS2_STOP = STOP_REG(CONFIG_SYS_CS2_START,
                                                                0x80000);
                        __asm__ volatile ("sync");
                        puts ("SRAM:  512 kB\n");
@@ -503,7 +503,7 @@ int last_stage_init (void)
        }
        /* restore origianl SRAM content  */
        if (restore) {
-               *(volatile u16 *)CFG_CS2_START = save;
+               *(volatile u16 *)CONFIG_SYS_CS2_START = save;
                __asm__ volatile ("sync");
        }
 
@@ -513,21 +513,21 @@ int last_stage_init (void)
         */
 
        /* save origianl FB content  */
-       save = *(volatile u16 *)CFG_CS1_START;
+       save = *(volatile u16 *)CONFIG_SYS_CS1_START;
        restore = 1;
 
        /* write test pattern to FB memory */
-       *(volatile u16 *)CFG_CS1_START = 0xA5A5;
+       *(volatile u16 *)CONFIG_SYS_CS1_START = 0xA5A5;
        __asm__ volatile ("sync");
        /*
         * Put a different pattern on the data lines: otherwise they may float
         * long enough to read back what we wrote.
         */
-       tmp = *(volatile u16 *)CFG_FLASH_BASE;
+       tmp = *(volatile u16 *)CONFIG_SYS_FLASH_BASE;
        if (tmp == 0xA5A5)
                puts ("!! possible error in grafic controller detection\n");
 
-       if (*(volatile u16 *)CFG_CS1_START != 0xA5A5) {
+       if (*(volatile u16 *)CONFIG_SYS_CS1_START != 0xA5A5) {
                /* no grafic controller at all, disable cs */
                *(vu_long *)MPC5XXX_ADDECR &= ~(1 << 17);
                *(vu_long *)MPC5XXX_CS1_START = 0x0000FFFF;
@@ -539,7 +539,7 @@ int last_stage_init (void)
        }
        /* restore origianl FB content  */
        if (restore) {
-               *(volatile u16 *)CFG_CS1_START = save;
+               *(volatile u16 *)CONFIG_SYS_CS1_START = save;
                __asm__ volatile ("sync");
        }
 
@@ -679,21 +679,21 @@ unsigned int board_video_init (void)
         */
 
        /* save origianl FB content  */
-       save = *(volatile u16 *)CFG_CS1_START;
+       save = *(volatile u16 *)CONFIG_SYS_CS1_START;
        restore = 1;
 
        /* write test pattern to FB memory */
-       *(volatile u16 *)CFG_CS1_START = 0xA5A5;
+       *(volatile u16 *)CONFIG_SYS_CS1_START = 0xA5A5;
        __asm__ volatile ("sync");
        /*
         * Put a different pattern on the data lines: otherwise they may float
         * long enough to read back what we wrote.
         */
-       tmp = *(volatile u16 *)CFG_FLASH_BASE;
+       tmp = *(volatile u16 *)CONFIG_SYS_FLASH_BASE;
        if (tmp == 0xA5A5)
                puts ("!! possible error in grafic controller detection\n");
 
-       if (*(volatile u16 *)CFG_CS1_START != 0xA5A5) {
+       if (*(volatile u16 *)CONFIG_SYS_CS1_START != 0xA5A5) {
                /* no grafic controller found */
                restore = 0;
                ret = 0;
@@ -702,7 +702,7 @@ unsigned int board_video_init (void)
        }
 
        if (restore) {
-               *(volatile u16 *)CFG_CS1_START = save;
+               *(volatile u16 *)CONFIG_SYS_CS1_START = save;
                __asm__ volatile ("sync");
        }
        return ret;