rename CFG_ macros to CONFIG_SYS

[platform/kernel/u-boot.git] / cpu / ixp / start.S

diff --git a/cpu/ixp/start.S b/cpu/ixp/start.S
index d4c8e33..196ba5d 100644 (file)
--- a/cpu/ixp/start.S
+++ b/cpu/ixp/start.S
@@ -154,7 +154,7 @@ reset:
        CPWAIT  r0
 
        /* set EXP CS0 to the optimum timing */
-       ldr     r1, =CFG_EXP_CS0
+       ldr     r1, =CONFIG_SYS_EXP_CS0
        ldr     r2, =IXP425_EXP_CS0
        str     r1, [r2]
 
@@ -165,7 +165,7 @@ reset:
        orr     r1, r1, #0x80000000
        str     r1, [r2]
 #endif
-       mov     r1, #CFG_SDR_CONFIG
+       mov     r1, #CONFIG_SYS_SDR_CONFIG
        ldr     r2, =IXP425_SDR_CONFIG
        str     r1, [r2]
 
@@ -181,7 +181,7 @@ reset:
        DELAY_FOR 0x4000, r0
 
        /* set SDRAM internal refresh val */
-       ldr     r1, =CFG_SDRAM_REFRESH_CNT
+       ldr     r1, =CONFIG_SYS_SDRAM_REFRESH_CNT
        str     r1, [r3]
        DELAY_FOR 0x4000, r0
 
@@ -199,7 +199,7 @@ reset:
        bne     111b
 
        /* set mode register in sdram */
-       mov     r1, #CFG_SDR_MODE_CONFIG
+       mov     r1, #CONFIG_SYS_SDR_MODE_CONFIG
        str     r1, [r4]
        DELAY_FOR 0x4000, r0
 
@@ -211,7 +211,7 @@ reset:
        /* copy */
        mov     r0, #0
        mov     r4, r0
-       add     r2, r0, #CFG_MONITOR_LEN
+       add     r2, r0, #CONFIG_SYS_MONITOR_LEN
        mov     r1, #0x10000000
        mov     r5, r1
 
@@ -283,8 +283,8 @@ copy_loop:
        /* Set up the stack                                                 */
 stack_setup:
        ldr     r0, _TEXT_BASE          /* upper 128 KiB: relocated uboot   */
-       sub     r0, r0, #CFG_MALLOC_LEN /* malloc area                      */
-       sub     r0, r0, #CFG_GBL_DATA_SIZE /* bdinfo                        */
+       sub     r0, r0, #CONFIG_SYS_MALLOC_LEN  /* malloc area                      */
+       sub     r0, r0, #CONFIG_SYS_GBL_DATA_SIZE /* bdinfo                        */
 #ifdef CONFIG_USE_IRQ
        sub     r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 #endif
@@ -345,8 +345,8 @@ _start_armboot: .word start_armboot
        add     r8, sp, #S_PC
 
        ldr     r2, _armboot_start
-       sub     r2, r2, #(CONFIG_STACKSIZE+CFG_MALLOC_LEN)
-       sub     r2, r2, #(CFG_GBL_DATA_SIZE+8)  @ set base 2 words into abort stack
+       sub     r2, r2, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
+       sub     r2, r2, #(CONFIG_SYS_GBL_DATA_SIZE+8)  @ set base 2 words into abort stack
        ldmia   r2, {r2 - r4}                   /* get pc, cpsr, old_r0     */
        add     r0, sp, #S_FRAME_SIZE           /* restore sp_SVC           */
 
@@ -382,8 +382,8 @@ _start_armboot: .word start_armboot
 
        .macro get_bad_stack
        ldr     r13, _armboot_start             @ setup our mode stack
-       sub     r13, r13, #(CONFIG_STACKSIZE+CFG_MALLOC_LEN)
-       sub     r13, r13, #(CFG_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
+       sub     r13, r13, #(CONFIG_STACKSIZE+CONFIG_SYS_MALLOC_LEN)
+       sub     r13, r13, #(CONFIG_SYS_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
 
        str     lr, [r13]                       @ save caller lr / spsr
        mrs     lr, spsr