|
@@ -35,6 +35,25 @@
|
|
#endif
|
|
#endif
|
|
.globl _start
|
|
.globl _start
|
|
_start: b reset
|
|
_start: b reset
|
|
|
|
+#ifdef CONFIG_ONENAND_IPL
|
|
|
|
+ ldr pc, _hang
|
|
|
|
+ ldr pc, _hang
|
|
|
|
+ ldr pc, _hang
|
|
|
|
+ ldr pc, _hang
|
|
|
|
+ ldr pc, _hang
|
|
|
|
+ ldr pc, _hang
|
|
|
|
+ ldr pc, _hang
|
|
|
|
+
|
|
|
|
+_hang:
|
|
|
|
+ .word do_hang
|
|
|
|
+ .word 0x12345678
|
|
|
|
+ .word 0x12345678
|
|
|
|
+ .word 0x12345678
|
|
|
|
+ .word 0x12345678
|
|
|
|
+ .word 0x12345678
|
|
|
|
+ .word 0x12345678
|
|
|
|
+ .word 0x12345678 /* now 16*4=64 */
|
|
|
|
+#else
|
|
ldr pc, _undefined_instruction
|
|
ldr pc, _undefined_instruction
|
|
ldr pc, _software_interrupt
|
|
ldr pc, _software_interrupt
|
|
ldr pc, _prefetch_abort
|
|
ldr pc, _prefetch_abort
|
|
@@ -51,6 +70,7 @@ _not_used: .word not_used
|
|
_irq: .word irq
|
|
_irq: .word irq
|
|
_fiq: .word fiq
|
|
_fiq: .word fiq
|
|
_pad: .word 0x12345678 /* now 16*4=64 */
|
|
_pad: .word 0x12345678 /* now 16*4=64 */
|
|
|
|
+#endif /* CONFIG_ONENAND_IPL */
|
|
.global _end_vect
|
|
.global _end_vect
|
|
_end_vect:
|
|
_end_vect:
|
|
|
|
|
|
@@ -139,7 +159,9 @@ relocate: /* relocate U-Boot to RAM */
|
|
adr r0, _start /* r0 <- current position of code */
|
|
adr r0, _start /* r0 <- current position of code */
|
|
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
|
ldr r1, _TEXT_BASE /* test if we run from flash or RAM */
|
|
cmp r0, r1 /* don't reloc during debug */
|
|
cmp r0, r1 /* don't reloc during debug */
|
|
|
|
+#ifndef CONFIG_ONENAND_IPL
|
|
beq stack_setup
|
|
beq stack_setup
|
|
|
|
+#endif /* CONFIG_ONENAND_IPL */
|
|
|
|
|
|
ldr r2, _armboot_start
|
|
ldr r2, _armboot_start
|
|
ldr r3, _bss_start
|
|
ldr r3, _bss_start
|
|
@@ -156,26 +178,36 @@ copy_loop:
|
|
/* Set up the stack */
|
|
/* Set up the stack */
|
|
stack_setup:
|
|
stack_setup:
|
|
ldr r0, _TEXT_BASE /* upper 128 KiB: relocated uboot */
|
|
ldr r0, _TEXT_BASE /* upper 128 KiB: relocated uboot */
|
|
|
|
+#ifdef CONFIG_ONENAND_IPL
|
|
|
|
+ sub sp, r0, #128 /* leave 32 words for abort-stack */
|
|
|
|
+#else
|
|
sub r0, r0, #CFG_MALLOC_LEN /* malloc area */
|
|
sub r0, r0, #CFG_MALLOC_LEN /* malloc area */
|
|
sub r0, r0, #CFG_GBL_DATA_SIZE /* bdinfo */
|
|
sub r0, r0, #CFG_GBL_DATA_SIZE /* bdinfo */
|
|
#ifdef CONFIG_USE_IRQ
|
|
#ifdef CONFIG_USE_IRQ
|
|
sub r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
|
|
sub r0, r0, #(CONFIG_STACKSIZE_IRQ+CONFIG_STACKSIZE_FIQ)
|
|
#endif
|
|
#endif
|
|
sub sp, r0, #12 /* leave 3 words for abort-stack */
|
|
sub sp, r0, #12 /* leave 3 words for abort-stack */
|
|
|
|
+#endif /* CONFIG_ONENAND_IPL */
|
|
|
|
|
|
clear_bss:
|
|
clear_bss:
|
|
ldr r0, _bss_start /* find start of bss segment */
|
|
ldr r0, _bss_start /* find start of bss segment */
|
|
ldr r1, _bss_end /* stop here */
|
|
ldr r1, _bss_end /* stop here */
|
|
mov r2, #0x00000000 /* clear */
|
|
mov r2, #0x00000000 /* clear */
|
|
|
|
|
|
|
|
+#ifndef CONFIG_ONENAND_IPL
|
|
clbss_l:str r2, [r0] /* clear loop... */
|
|
clbss_l:str r2, [r0] /* clear loop... */
|
|
add r0, r0, #4
|
|
add r0, r0, #4
|
|
cmp r0, r1
|
|
cmp r0, r1
|
|
bne clbss_l
|
|
bne clbss_l
|
|
|
|
+#endif
|
|
|
|
|
|
ldr pc, _start_armboot
|
|
ldr pc, _start_armboot
|
|
|
|
|
|
|
|
+#ifdef CONFIG_ONENAND_IPL
|
|
|
|
+_start_armboot: .word start_oneboot
|
|
|
|
+#else
|
|
_start_armboot: .word start_armboot
|
|
_start_armboot: .word start_armboot
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -214,6 +246,8 @@ cpu_init_crit:
|
|
bl lowlevel_init /* go setup pll,mux,memory */
|
|
bl lowlevel_init /* go setup pll,mux,memory */
|
|
mov lr, ip /* restore link */
|
|
mov lr, ip /* restore link */
|
|
mov pc, lr /* back to my caller */
|
|
mov pc, lr /* back to my caller */
|
|
|
|
+
|
|
|
|
+#ifndef CONFIG_ONENAND_IPL
|
|
/*
|
|
/*
|
|
*************************************************************************
|
|
*************************************************************************
|
|
*
|
|
*
|
|
@@ -326,10 +360,17 @@ cpu_init_crit:
|
|
.macro get_fiq_stack @ setup FIQ stack
|
|
.macro get_fiq_stack @ setup FIQ stack
|
|
ldr sp, FIQ_STACK_START
|
|
ldr sp, FIQ_STACK_START
|
|
.endm
|
|
.endm
|
|
|
|
+#endif /* CONFIG_ONENAND_IPL */
|
|
|
|
|
|
/*
|
|
/*
|
|
* exception handlers
|
|
* exception handlers
|
|
*/
|
|
*/
|
|
|
|
+#ifdef CONFIG_ONENAND_IPL
|
|
|
|
+ .align 5
|
|
|
|
+do_hang:
|
|
|
|
+ ldr sp, _TEXT_BASE /* use 32 words about stack */
|
|
|
|
+ bl hang /* hang and never return */
|
|
|
|
+#else /* !CONFIG_ONENAND IPL */
|
|
.align 5
|
|
.align 5
|
|
undefined_instruction:
|
|
undefined_instruction:
|
|
get_bad_stack
|
|
get_bad_stack
|
|
@@ -415,3 +456,4 @@ rstctl:
|
|
.word PM_RSTCTRL_WKUP
|
|
.word PM_RSTCTRL_WKUP
|
|
|
|
|
|
#endif
|
|
#endif
|
|
|
|
+#endif /* CONFIG_ONENAND_IPL */
|