projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-sh
[oweals/u-boot.git]
/
cpu
/
arm926ejs
/
start.S
diff --git
a/cpu/arm926ejs/start.S
b/cpu/arm926ejs/start.S
index 725c6639a1e506054d74a7642291d5c058b5277f..a61fa1847ded92ffeb3101c2a736091f2e4065c4 100644
(file)
--- a/
cpu/arm926ejs/start.S
+++ b/
cpu/arm926ejs/start.S
@@
-175,13
+175,16
@@
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
+ bl coloured_LED_init
+ bl red_LED_on
+
ldr pc, _start_armboot
_start_armboot:
ldr pc, _start_armboot
_start_armboot:
@@
-198,8
+201,7
@@
_start_armboot:
*
*************************************************************************
*/
*
*************************************************************************
*/
-
-
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
cpu_init_crit:
/*
* flush v4 I/D caches
cpu_init_crit:
/*
* flush v4 I/D caches
@@
-225,6
+227,8
@@
cpu_init_crit:
bl lowlevel_init /* go setup pll,mux,memory */
mov lr, ip /* restore link */
mov pc, lr /* back to my caller */
bl lowlevel_init /* go setup pll,mux,memory */
mov lr, ip /* restore link */
mov pc, lr /* back to my caller */
+#endif /* CONFIG_SKIP_LOWLEVEL_INIT */
+
/*
*************************************************************************
*
/*
*************************************************************************
*
@@
-366,7
+370,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
@@
-374,7
+378,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