Merge branch 'next' of git://git.denx.de/u-boot-avr32

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

diff --git a/cpu/mcf52x2/start.S b/cpu/mcf52x2/start.S
index f6c58c2..2e8ecfb 100644 (file)
--- a/cpu/mcf52x2/start.S
+++ b/cpu/mcf52x2/start.S
@@ -56,9 +56,7 @@
 _vectors:
 
 .long  0x00000000              /* Flash offset is 0 until we setup CS0 */
-#if defined(CONFIG_R5200)
-.long  0x400
-#elif defined(CONFIG_M5282) && (TEXT_BASE == CFG_INT_FLASH_BASE)
+#if defined(CONFIG_M5282) && (TEXT_BASE == CFG_INT_FLASH_BASE)
 .long  _start - TEXT_BASE
 #else
 .long  _START
@@ -168,7 +166,7 @@ _after_flashbar_copy:
 #else
        /* Setup code to initialize FLASHBAR, if start from external Memory */
        move.l  #(CFG_INT_FLASH_BASE + CFG_INT_FLASH_ENABLE), %d0
-       movec   %d0, %RAMBAR1
+       movec   %d0, %FLASHBAR
 #endif /* (TEXT_BASE == CFG_INT_FLASH_BASE) */
 
 #endif
@@ -185,18 +183,6 @@ _after_flashbar_copy:
        movec   %d0, %VBR
 #endif
 
-#ifdef CONFIG_R5200
-       move.l  #(_flash_setup-CFG_FLASH_BASE), %a0
-       move.l  #(_flash_setup_end-CFG_FLASH_BASE), %a1
-       move.l  #(CFG_INIT_RAM_ADDR), %a2
-_copy_flash:
-       move.l  (%a0)+, (%a2)+
-       cmp.l   %a0, %a1
-       bgt.s   _copy_flash
-       jmp     CFG_INIT_RAM_ADDR
-_after_flash_copy:
-#endif
-
 #ifdef CONFIG_M5275
        /* Initialize IPSBAR */
        move.l  #(CFG_MBAR + 1), %d0            /* set IPSBAR address + valid flag */
@@ -230,24 +216,6 @@ _after_flash_copy:
 
 /*------------------------------------------------------------------------------*/
 
-#ifdef CONFIG_R5200
-_flash_setup:
-       /* CSAR0 */
-       move.l  #((CFG_FLASH_BASE & 0xffff0000) >> 16), %d0
-       move.w  %d0, 0x40000080
-
-       /* CSCR0 */
-       move.l  #0x2180, %d0            /* 8 wait states, 16bit port, auto ack,  */
-       move.w  %d0, 0x4000008A
-
-       /* CSMR0 */
-       move.l  #0x001f0001, %d0        /* 2 MB, valid */
-       move.l  %d0, 0x40000084
-
-       jmp     _after_flash_copy.L
-_flash_setup_end:
-#endif
-
 /*
  * void relocate_code (addr_sp, gd, addr_moni)
  *
@@ -280,14 +248,14 @@ relocate_code:
  * We are done. Do not return, instead branch to second part of board
  * initialization, now running from RAM.
  */
-       move.l  %a0, %a1
+       move.l  %a0, %a1
        add.l   #(in_ram - CFG_MONITOR_BASE), %a1
        jmp     (%a1)
 
 in_ram:
 
 clear_bss:
-       /*
+       /*
         * Now clear BSS segment
         */
        move.l  %a0, %a1
@@ -448,7 +416,7 @@ icache_enable:
         *  Note: The 5249 Documentation doesn't give a bit position for CINV!
         *  From the 5272 and the 5307 documentation, I have deduced that it is
         *  probably CACR[24]. Should someone say something to Motorola?
-        *      ~Jeremy
+        *      ~Jeremy
         */
        move.l  #0x01000000, %d0                /* Invalidate whole cache */
        move.c  %d0,%CACR
@@ -508,3 +476,4 @@ version_string:
        .ascii U_BOOT_VERSION
        .ascii " (", __DATE__, " - ", __TIME__, ")"
        .ascii CONFIG_IDENT_STRING, "\0"
+       .align 4