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-arm
[oweals/u-boot.git]
/
cpu
/
ixp
/
start.S
diff --git
a/cpu/ixp/start.S
b/cpu/ixp/start.S
index d4c8e33bc5e603acc2e5bdc281d3b22b7eb76445..196ba5db2eaf760c750b1c4a8b0ac41ea18b1cf6 100644
(file)
--- a/
cpu/ixp/start.S
+++ b/
cpu/ixp/start.S
@@
-154,7
+154,7
@@
reset:
CPWAIT r0
/* set EXP CS0 to the optimum timing */
CPWAIT r0
/* set EXP CS0 to the optimum timing */
- ldr r1, =C
FG
_EXP_CS0
+ ldr r1, =C
ONFIG_SYS
_EXP_CS0
ldr r2, =IXP425_EXP_CS0
str r1, [r2]
ldr r2, =IXP425_EXP_CS0
str r1, [r2]
@@
-165,7
+165,7
@@
reset:
orr r1, r1, #0x80000000
str r1, [r2]
#endif
orr r1, r1, #0x80000000
str r1, [r2]
#endif
- mov r1, #C
FG
_SDR_CONFIG
+ mov r1, #C
ONFIG_SYS
_SDR_CONFIG
ldr r2, =IXP425_SDR_CONFIG
str r1, [r2]
ldr r2, =IXP425_SDR_CONFIG
str r1, [r2]
@@
-181,7
+181,7
@@
reset:
DELAY_FOR 0x4000, r0
/* set SDRAM internal refresh val */
DELAY_FOR 0x4000, r0
/* set SDRAM internal refresh val */
- ldr r1, =C
FG
_SDRAM_REFRESH_CNT
+ ldr r1, =C
ONFIG_SYS
_SDRAM_REFRESH_CNT
str r1, [r3]
DELAY_FOR 0x4000, r0
str r1, [r3]
DELAY_FOR 0x4000, r0
@@
-199,7
+199,7
@@
reset:
bne 111b
/* set mode register in sdram */
bne 111b
/* set mode register in sdram */
- mov r1, #C
FG
_SDR_MODE_CONFIG
+ mov r1, #C
ONFIG_SYS
_SDR_MODE_CONFIG
str r1, [r4]
DELAY_FOR 0x4000, r0
str r1, [r4]
DELAY_FOR 0x4000, r0
@@
-211,7
+211,7
@@
reset:
/* copy */
mov r0, #0
mov r4, r0
/* copy */
mov r0, #0
mov r4, r0
- add r2, r0, #C
FG
_MONITOR_LEN
+ add r2, r0, #C
ONFIG_SYS
_MONITOR_LEN
mov r1, #0x10000000
mov r5, r1
mov r1, #0x10000000
mov r5, r1
@@
-283,8
+283,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
@@
-345,8
+345,8
@@
_start_armboot: .word start_armboot
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 */
@@
-382,8
+382,8
@@
_start_armboot: .word start_armboot
.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