rename CFG_ macros to CONFIG_SYS

[karo-tx-uboot.git] / cpu / mcf532x / start.S

diff --git a/cpu/mcf532x/start.S b/cpu/mcf532x/start.S
index 61be2eac695b122d81782849e198bc8fc8cd1d37..7a3eb5f98c558cb1f288e5df3ba8586777946793 100644 (file)
--- a/cpu/mcf532x/start.S
+++ b/cpu/mcf532x/start.S
@@ -49,7 +49,7 @@
 _vectors:
 
 INITSP:                .long   0x00000000      /* Initial SP   */
-INITPC:                .long   _START  /* Initial PC           */
+INITPC:                .long   _START  /* Initial PC           */
 vector02:      .long   _FAULT  /* Access Error         */
 vector03:      .long   _FAULT  /* Address Error        */
 vector04:      .long   _FAULT  /* Illegal Instruction  */
@@ -127,10 +127,10 @@ _start:
        move.w #0x2700,%sr      /* Mask off Interrupt */
 
        /* Set vector base register at the beginning of the Flash */
-       move.l  #CFG_FLASH_BASE, %d0
+       move.l  #CONFIG_SYS_FLASH_BASE, %d0
        movec   %d0, %VBR
 
-       move.l  #(CFG_INIT_RAM_ADDR + CFG_INIT_RAM_CTRL), %d0
+       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_CTRL), %d0
        movec   %d0, %RAMBAR1
 
        /* invalidate and disable cache */
@@ -142,14 +142,14 @@ _start:
 
        /* initialize general use internal ram */
        move.l #0, %d0
-       move.l #(CFG_INIT_RAM_ADDR+CFG_INIT_RAM_END-8), %a1
-       move.l #(CFG_INIT_RAM_ADDR+CFG_INIT_RAM_END-4), %a2
+       move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-8), %a1
+       move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-4), %a2
        move.l %d0, (%a1)
        move.l %d0, (%a2)
 
        /* set stackpointer to end of internal ram to get some stackspace for the
           first c-code */
-       move.l  #(CFG_INIT_RAM_ADDR + CFG_INIT_SP_OFFSET), %sp
+       move.l  #(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET), %sp
        clr.l %sp@-
 
        move.l #__got_start, %a5        /* put relocation table address to a5 */
@@ -180,7 +180,7 @@ relocate_code:
        move.l 12(%a6), %d0             /* Save copy of Global Data pointer */
        move.l 16(%a6), %a0             /* Save copy of Destination Address */
 
-       move.l #CFG_MONITOR_BASE, %a1
+       move.l #CONFIG_SYS_MONITOR_BASE, %a1
        move.l #__init_end, %a2
        move.l %a0, %a3
 
@@ -195,7 +195,7 @@ relocate_code:
  * initialization, now running from RAM.
  */
        move.l  %a0, %a1
-       add.l   #(in_ram - CFG_MONITOR_BASE), %a1
+       add.l   #(in_ram - CONFIG_SYS_MONITOR_BASE), %a1
        jmp     (%a1)
 
 in_ram:
@@ -205,9 +205,9 @@ clear_bss:
         * Now clear BSS segment
         */
        move.l  %a0, %a1
-       add.l   #(_sbss - CFG_MONITOR_BASE),%a1
+       add.l   #(_sbss - CONFIG_SYS_MONITOR_BASE),%a1
        move.l  %a0, %d1
-       add.l   #(_ebss - CFG_MONITOR_BASE),%d1
+       add.l   #(_ebss - CONFIG_SYS_MONITOR_BASE),%d1
 6:
        clr.l   (%a1)+
        cmp.l   %a1,%d1
@@ -217,11 +217,11 @@ clear_bss:
         * fix got table in RAM
         */
        move.l  %a0, %a1
-       add.l   #(__got_start - CFG_MONITOR_BASE),%a1
+       add.l   #(__got_start - CONFIG_SYS_MONITOR_BASE),%a1
        move.l  %a1,%a5         /* * fix got pointer register a5 */
 
        move.l  %a0, %a2
-       add.l   #(__got_end - CFG_MONITOR_BASE),%a2
+       add.l   #(__got_end - CONFIG_SYS_MONITOR_BASE),%a2
 
 7:
        move.l  (%a1),%d1
@@ -233,7 +233,7 @@ clear_bss:
 
        /* calculate relative jump to board_init_r in ram */
        move.l %a0, %a1
-       add.l #(board_init_r - CFG_MONITOR_BASE), %a1
+       add.l #(board_init_r - CONFIG_SYS_MONITOR_BASE), %a1
 
        /* set parameters for board_init_r */
        move.l %a0,-(%sp)               /* dest_addr */
@@ -268,14 +268,14 @@ _int_handler:
 icache_enable:
        move.l  #0x01000000, %d0                /* Invalidate cache cmd */
        movec   %d0, %CACR                      /* Invalidate cache */
-       move.l  #(CFG_SDRAM_BASE + 0x1c000), %d0
+       move.l  #(CONFIG_SYS_SDRAM_BASE + 0x1c000), %d0
        movec   %d0, %ACR0                      /* Enable cache */
 
        move.l  #0x80000200, %d0                /* Setup cache mask */
        movec   %d0, %CACR                      /* Enable cache */
        nop
 
-       move.l #(CFG_INIT_RAM_ADDR+CFG_INIT_RAM_END-8), %a1
+       move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-8), %a1
        moveq   #1, %d0
        move.l  %d0, (%a1)
        rts
@@ -288,14 +288,14 @@ icache_disable:
        movec   %d0, %ACR0
        movec   %d0, %ACR1
 
-       move.l #(CFG_INIT_RAM_ADDR+CFG_INIT_RAM_END-8), %a1
+       move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-8), %a1
        moveq   #0, %d0
        move.l  %d0, (%a1)
        rts
 
        .globl  icache_status
 icache_status:
-       move.l #(CFG_INIT_RAM_ADDR+CFG_INIT_RAM_END-8), %a1
+       move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-8), %a1
        move.l  (%a1), %d0
        rts
 
@@ -307,7 +307,7 @@ icache_invalid:
 
        .globl  dcache_enable
 dcache_enable:
-       move.l #(CFG_INIT_RAM_ADDR+CFG_INIT_RAM_END-4), %a1
+       move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-4), %a1
        moveq   #1, %d0
        move.l  %d0, (%a1)
        rts
@@ -315,14 +315,14 @@ dcache_enable:
     /* No dcache, just a dummy function */
        .globl  dcache_disable
 dcache_disable:
-       move.l #(CFG_INIT_RAM_ADDR+CFG_INIT_RAM_END-4), %a1
+       move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-4), %a1
        moveq   #0, %d0
        move.l  %d0, (%a1)
        rts
 
        .globl  dcache_status
 dcache_status:
-       move.l #(CFG_INIT_RAM_ADDR+CFG_INIT_RAM_END-4), %a1
+       move.l #(CONFIG_SYS_INIT_RAM_ADDR+CONFIG_SYS_INIT_RAM_END-4), %a1
        move.l  (%a1), %d0
        rts
 
@@ -333,3 +333,4 @@ version_string:
        .ascii U_BOOT_VERSION
        .ascii " (", __DATE__, " - ", __TIME__, ")"
        .ascii CONFIG_IDENT_STRING, "\0"
+       .align 4