projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
cpu
/
arm720t
/
start.S
diff --git
a/cpu/arm720t/start.S
b/cpu/arm720t/start.S
index
8423e4f
..
022b873
100644
(file)
--- a/
cpu/arm720t/start.S
+++ b/
cpu/arm720t/start.S
@@
-166,8
+166,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, #C
FG_MALLOC_LEN /* malloc area
*/
- sub r0, r0, #C
FG_GBL_DATA_SIZE /* bdinfo
*/
+ sub r0, r0, #C
ONFIG_SYS_MALLOC_LEN /* malloc area
*/
+ sub r0, r0, #C
ONFIG_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
@@
-444,8
+444,8
@@
lock_loop:
add r8, sp, #S_PC
ldr r2, _armboot_start
add r8, sp, #S_PC
ldr r2, _armboot_start
- sub r2, r2, #(CONFIG_STACKSIZE+C
FG
_MALLOC_LEN)
- sub r2, r2, #(C
FG_GBL_DATA_SIZE+8)
@ set base 2 words into abort stack
+ sub r2, r2, #(CONFIG_STACKSIZE+C
ONFIG_SYS
_MALLOC_LEN)
+ sub r2, r2, #(C
ONFIG_SYS_GBL_DATA_SIZE+8)
@ set base 2 words into abort stack
ldmia r2, {r2 - r4} @ get pc, cpsr, old_r0
add r0, sp, #S_FRAME_SIZE @ restore sp_SVC
ldmia r2, {r2 - r4} @ get pc, cpsr, old_r0
add r0, sp, #S_FRAME_SIZE @ restore sp_SVC
@@
-477,8
+477,8
@@
lock_loop:
.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+C
FG
_MALLOC_LEN)
- sub r13, r13, #(C
FG
_GBL_DATA_SIZE+8) @ reserved a couple spots in abort stack
+ sub r13, r13, #(CONFIG_STACKSIZE+C
ONFIG_SYS
_MALLOC_LEN)
+ sub r13, r13, #(C
ONFIG_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