Big white-space cleanup.

[J-u-boot.git] / cpu / mcf5445x / start.S

diff --git a/cpu/mcf5445x/start.S b/cpu/mcf5445x/start.S
index cd989ab6261460b4df95a3da7b2e7ef535baba46..3241b278e1cabc9d5c5a537f9d5635e01242b5f3 100644 (file)
--- a/cpu/mcf5445x/start.S
+++ b/cpu/mcf5445x/start.S
@@ -54,7 +54,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  */
@@ -136,7 +136,7 @@ _start:
        movec   %d0, %VBR
 
        move.l  #(CFG_INIT_RAM_ADDR + CFG_INIT_RAM_CTRL), %d0
-       movec   %d0, %RAMBAR0
+       movec   %d0, %RAMBAR1
 
        /* initialize general use internal ram */
        move.l #0, %d0
@@ -279,14 +279,13 @@ icache_enable:
        move.l  (%a1), %d1
 
        move.l  #0x00040100, %d0        /* Invalidate icache */
-       or.l    %d1, %d0
        movec   %d0, %CACR
 
-       move.l  #(CFG_SDRAM_BASE + 0xc000), %d0 /* Setup icache */
+       move.l  #(CFG_SDRAM_BASE + 0x1c000), %d0        /* Setup icache */
        movec   %d0, %ACR2
 
-       or.l    #0x00088400, %d1        /* Enable bcache and icache */
-       movec   %d1, %CACR
+       move.l  #0x04088020, %d0        /* Enable bcache and icache */
+       movec   %d0, %CACR
 
        move.l #(ICACHE_STATUS), %a1
        moveq   #1, %d0
@@ -298,7 +297,7 @@ icache_disable:
        move.l #(CACR_STATUS), %a1      /* read CACR Status */
        move.l  (%a1), %d0
 
-       and.l   #0xFFF77BFF, %d0
+       move.l  #0xFFF77BFF, %d0
        or.l    #0x00040100, %d0        /* Setup cache mask */
        movec   %d0, %CACR              /* Invalidate icache */
        clr.l   %d0
@@ -321,7 +320,7 @@ icache_invalid:
        move.l #(CACR_STATUS), %a1      /* read CACR Status */
        move.l  (%a1), %d0
 
-       or.l    #0x00040100, %d0        /* Invalidate icache */
+       move.l  #0x00040100, %d0        /* Invalidate icache */
        movec   %d0, %CACR              /* Enable and invalidate cache */
        rts
 
@@ -330,17 +329,11 @@ dcache_enable:
        move.l #(CACR_STATUS), %a1      /* read CACR Status */
        move.l  (%a1), %d1
 
-       move.l  #0x01000000, %d0
-       or.l    %d1, %d0
+       move.l  #0x01040100, %d0
        movec   %d0, %CACR              /* Invalidate dcache */
 
-       move.l  #(CFG_SDRAM_BASE + 0xc000), %d0
-       movec   %d0, %ACR0
-       move.l  #0, %d0
-       movec   %d0, %ACR1
-
-       or.l    #0x80000000, %d1        /* Enable bcache and icache */
-       movec   %d1, %CACR
+       move.l  #0x80088020, %d0        /* Enable bcache and icache */
+       movec   %d0, %CACR
 
        move.l #(DCACHE_STATUS), %a1
        moveq   #1, %d0
@@ -369,7 +362,7 @@ dcache_invalid:
        move.l #(CACR_STATUS), %a1      /* read CACR Status */
        move.l  (%a1), %d0
 
-       or.l    #0x01000000, %d0        /* Setup cache mask */
+       move.l  #0x81088020, %d0        /* Setup cache mask */
        movec   %d0, %CACR              /* Enable and invalidate cache */
        rts
 
@@ -386,3 +379,4 @@ version_string:
        .ascii U_BOOT_VERSION
        .ascii " (", __DATE__, " - ", __TIME__, ")"
        .ascii CONFIG_IDENT_STRING, "\0"
+       .align 4