imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

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

diff --git a/cpu/arm920t/start.S b/cpu/arm920t/start.S
index 346f0d09ea77a18b2c9a7b2a3d08a078a9aa4741..27f38b808917700a35ab683713cd3b8e7a3f7f15 100755 (executable)
--- a/cpu/arm920t/start.S
+++ b/cpu/arm920t/start.S
@@ -3,7 +3,7 @@
  *
  *  Copyright (c) 2001 Marius Gröger <mag@sysgo.de>
  *  Copyright (c) 2002 Alex Züpke <azu@sysgo.de>
  *
  *  Copyright (c) 2001 Marius Gröger <mag@sysgo.de>
  *  Copyright (c) 2002 Alex Züpke <azu@sysgo.de>

- *  Copyright (c) 2002 Gary Jennejohn <gj@denx.de>
+ *  Copyright (c) 2002 Gary Jennejohn <garyj@denx.de>

  *
  * See file CREDITS for list of people who contributed to this
  * project.
  *
  * See file CREDITS for list of people who contributed to this
  * project.


@@ -24,10 +24,8 @@
  * MA 02111-1307 USA
  */
 
  * MA 02111-1307 USA
  */
 

-
+#include <common.h>

 #include <config.h>
 #include <config.h>

-#include <version.h>
-

 
 /*
  *************************************************************************
 
 /*
  *************************************************************************


@@ -39,7 +37,7 @@
 
 
 .globl _start
 
 
 .globl _start

-_start:        b       reset
+_start:        b       start_code

        ldr     pc, _undefined_instruction
        ldr     pc, _software_interrupt
        ldr     pc, _prefetch_abort
        ldr     pc, _undefined_instruction
        ldr     pc, _software_interrupt
        ldr     pc, _prefetch_abort


@@ -62,7 +60,7 @@ _fiq:                 .word fiq
 /*
  *************************************************************************
  *
 /*
  *************************************************************************
  *

- * Startup Code (reset vector)
+ * Startup Code (called from the ARM reset exception vector)

  *
  * do important init only if we don't start from memory!
  * relocate armboot to ram
  *
  * do important init only if we don't start from memory!
  * relocate armboot to ram


@@ -104,10 +102,10 @@ FIQ_STACK_START:
 
 
 /*
 
 
 /*

- * the actual reset code
+ * the actual start code

  */
 
  */
 

-reset:
+start_code:

        /*
         * set the cpu to SVC32 mode
         */
        /*
         * set the cpu to SVC32 mode
         */


@@ -116,19 +114,37 @@ reset:
        orr     r0,r0,#0xd3
        msr     cpsr,r0
 
        orr     r0,r0,#0xd3
        msr     cpsr,r0
 

-/* turn off the watchdog */
-#if defined(CONFIG_S3C2400)
-# define pWTCON                0x15300000
-# define INTMSK                0x14400008      /* Interupt-Controller base addresses */
-# define CLKDIVN       0x14800014      /* clock divisor register */
-#elif defined(CONFIG_S3C2410)
-# define pWTCON                0x53000000
-# define INTMSK                0x4A000008      /* Interupt-Controller base addresses */
-# define INTSUBMSK     0x4A00001C
-# define CLKDIVN       0x4C000014      /* clock divisor register */
+       bl coloured_LED_init
+       bl red_LED_on
+
+#if    defined(CONFIG_AT91RM9200DK) || defined(CONFIG_AT91RM9200EK)
+       /*
+        * relocate exception table
+        */
+       ldr     r0, =_start
+       ldr     r1, =0x0
+       mov     r2, #16
+copyex:
+       subs    r2, r2, #1
+       ldr     r3, [r0], #4
+       str     r3, [r1], #4
+       bne     copyex

 #endif
 
 #if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)
 #endif
 
 #if defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410)

+       /* turn off the watchdog */
+
+# if defined(CONFIG_S3C2400)
+#  define pWTCON               0x15300000
+#  define INTMSK               0x14400008      /* Interupt-Controller base addresses */
+#  define CLKDIVN      0x14800014      /* clock divisor register */
+#else
+#  define pWTCON               0x53000000
+#  define INTMSK               0x4A000008      /* Interupt-Controller base addresses */
+#  define INTSUBMSK    0x4A00001C
+#  define CLKDIVN      0x4C000014      /* clock divisor register */
+# endif
+

        ldr     r0, =pWTCON
        mov     r1, #0x0
        str     r1, [r0]
        ldr     r0, =pWTCON
        mov     r1, #0x0
        str     r1, [r0]


@@ -182,8 +198,8 @@ copy_loop:
        /* Set up the stack                                                 */
 stack_setup:
        ldr     r0, _TEXT_BASE          /* upper 128 KiB: relocated uboot   */
        /* 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
 #ifdef CONFIG_USE_IRQ
        sub     r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
 #endif


@@ -192,34 +208,13 @@ stack_setup:
 clear_bss:
        ldr     r0, _bss_start          /* find start of bss segment        */
        ldr     r1, _bss_end            /* stop here                        */
 clear_bss:
        ldr     r0, _bss_start          /* find start of bss segment        */
        ldr     r1, _bss_end            /* stop here                        */

-       mov     r2, #0x00000000         /* clear                            */
+       mov     r2, #0x00000000         /* clear                            */

 
 clbss_l:str    r2, [r0]                /* clear loop...                    */
        add     r0, r0, #4
        cmp     r0, r1
        ble     clbss_l
 
 
 clbss_l:str    r2, [r0]                /* clear loop...                    */
        add     r0, r0, #4
        cmp     r0, r1
        ble     clbss_l
 

-#if 0
-       /* try doing this stuff after the relocation */
-       ldr     r0, =pWTCON
-       mov     r1, #0x0
-       str     r1, [r0]
-
-       /*
-        * mask all IRQs by setting all bits in the INTMR - default
-        */
-       mov     r1, #0xffffffff
-       ldr     r0, =INTMR
-       str     r1, [r0]
-
-       /* FCLK:HCLK:PCLK = 1:2:4 */
-       /* default FCLK is 120 MHz ! */
-       ldr     r0, =CLKDIVN
-       mov     r1, #3
-       str     r1, [r0]
-       /* END stuff after relocation */
-#endif
-

        ldr     pc, _start_armboot
 
 _start_armboot:        .word start_armboot
        ldr     pc, _start_armboot
 
 _start_armboot:        .word start_armboot


@@ -262,7 +257,9 @@ cpu_init_crit:
         * find a lowlevel_init.S in your board directory.
         */
        mov     ip, lr
         * find a lowlevel_init.S in your board directory.
         */
        mov     ip, lr

+

        bl      lowlevel_init
        bl      lowlevel_init

+

        mov     lr, ip
        mov     pc, lr
 #endif /* CONFIG_SKIP_LOWLEVEL_INIT */
        mov     lr, ip
        mov     pc, lr
 #endif /* CONFIG_SKIP_LOWLEVEL_INIT */


@@ -312,8 +309,9 @@ cpu_init_crit:
        sub     sp, sp, #S_FRAME_SIZE
        stmia   sp, {r0 - r12}                  @ Calling r0-r12
        ldr     r2, _armboot_start
        sub     sp, sp, #S_FRAME_SIZE
        stmia   sp, {r0 - r12}                  @ Calling r0-r12
        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)
+       sub     r2, r2, #(CONFIG_SYS_MALLOC_LEN)
+       sub     r2, r2, #(CONFIG_SYS_GBL_DATA_SIZE+8)  @ set base 2 words into abort stack

        ldmia   r2, {r2 - r3}                   @ get pc, cpsr
        add     r0, sp, #S_FRAME_SIZE           @ restore sp_SVC
 
        ldmia   r2, {r2 - r3}                   @ get pc, cpsr
        add     r0, sp, #S_FRAME_SIZE           @ restore sp_SVC
 


@@ -326,12 +324,12 @@ cpu_init_crit:
        .macro  irq_save_user_regs
        sub     sp, sp, #S_FRAME_SIZE
        stmia   sp, {r0 - r12}                  @ Calling r0-r12
        .macro  irq_save_user_regs
        sub     sp, sp, #S_FRAME_SIZE
        stmia   sp, {r0 - r12}                  @ Calling r0-r12

-       add     r8, sp, #S_PC
-       stmdb   r8, {sp, lr}^                   @ Calling SP, LR
-       str     lr, [r8, #0]                    @ Save calling PC
+       add     r7, sp, #S_PC
+       stmdb   r7, {sp, lr}^                   @ Calling SP, LR
+       str     lr, [r7, #0]                    @ Save calling PC

        mrs     r6, spsr
        mrs     r6, spsr

-       str     r6, [r8, #4]                    @ Save CPSR
-       str     r0, [r8, #8]                    @ Save OLD_R0
+       str     r6, [r7, #4]                    @ Save CPSR
+       str     r0, [r7, #8]                    @ Save OLD_R0

        mov     r0, sp
        .endm
 
        mov     r0, sp
        .endm
 


@@ -345,8 +343,9 @@ cpu_init_crit:
 
        .macro get_bad_stack
        ldr     r13, _armboot_start             @ setup our mode stack
 
        .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)
+       sub     r13, r13, #(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
 
        str     lr, [r13]                       @ save caller lr / spsr
        mrs     lr, spsr


@@ -374,31 +373,31 @@ cpu_init_crit:
 undefined_instruction:
        get_bad_stack
        bad_save_user_regs
 undefined_instruction:
        get_bad_stack
        bad_save_user_regs

-       bl      do_undefined_instruction
+       bl      do_undefined_instruction

 
        .align  5
 software_interrupt:
        get_bad_stack
        bad_save_user_regs
 
        .align  5
 software_interrupt:
        get_bad_stack
        bad_save_user_regs

-       bl      do_software_interrupt
+       bl      do_software_interrupt

 
        .align  5
 prefetch_abort:
        get_bad_stack
        bad_save_user_regs
 
        .align  5
 prefetch_abort:
        get_bad_stack
        bad_save_user_regs

-       bl      do_prefetch_abort
+       bl      do_prefetch_abort

 
        .align  5
 data_abort:
        get_bad_stack
        bad_save_user_regs
 
        .align  5
 data_abort:
        get_bad_stack
        bad_save_user_regs

-       bl      do_data_abort
+       bl      do_data_abort

 
        .align  5
 not_used:
        get_bad_stack
        bad_save_user_regs
 
        .align  5
 not_used:
        get_bad_stack
        bad_save_user_regs

-       bl      do_not_used
+       bl      do_not_used

 
 #ifdef CONFIG_USE_IRQ
 
 
 #ifdef CONFIG_USE_IRQ
 


@@ -406,7 +405,7 @@ not_used:
 irq:
        get_irq_stack
        irq_save_user_regs
 irq:
        get_irq_stack
        irq_save_user_regs

-       bl      do_irq
+       bl      do_irq

        irq_restore_user_regs
 
        .align  5
        irq_restore_user_regs
 
        .align  5


@@ -414,7 +413,7 @@ fiq:
        get_fiq_stack
        /* someone ought to write a more effiction fiq_save_user_regs */
        irq_save_user_regs
        get_fiq_stack
        /* someone ought to write a more effiction fiq_save_user_regs */
        irq_save_user_regs

-       bl      do_fiq
+       bl      do_fiq

        irq_restore_user_regs
 
 #else
        irq_restore_user_regs
 
 #else


@@ -423,12 +422,12 @@ fiq:
 irq:
        get_bad_stack
        bad_save_user_regs
 irq:
        get_bad_stack
        bad_save_user_regs

-       bl      do_irq
+       bl      do_irq

 
        .align  5
 fiq:
        get_bad_stack
        bad_save_user_regs
 
        .align  5
 fiq:
        get_bad_stack
        bad_save_user_regs

-       bl      do_fiq
+       bl      do_fiq

 
 #endif
 
 #endif