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-nand-flash
[oweals/u-boot.git]
/
arch
/
arm
/
cpu
/
arm_intcm
/
start.S
diff --git
a/arch/arm/cpu/arm_intcm/start.S
b/arch/arm/cpu/arm_intcm/start.S
index 79ef517369f9713e05ddb0e36d502f2dac9705de..07356cb5fd018983d5fd98a0382c1caf6b9f5467 100644
(file)
--- a/
arch/arm/cpu/arm_intcm/start.S
+++ b/
arch/arm/cpu/arm_intcm/start.S
@@
-85,7
+85,7
@@
_fiq:
.globl _TEXT_BASE
_TEXT_BASE:
- .word TEXT_BASE /* address of _start in the linked image */
+ .word
CONFIG_SYS_
TEXT_BASE /* address of _start in the linked image */
#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
.globl _armboot_start