summaryrefslogtreecommitdiffstats
path: root/arch/nios2
diff options
context:
space:
mode:
authorThomas Chou <thomas@wytron.com.tw>2015-09-04 16:39:16 +0800
committerThomas Chou <thomas@wytron.com.tw>2015-10-23 07:28:38 +0800
commite900298ea4798cfb82cf89bdcf255f3614a5e1d8 (patch)
treed3b4a97a6f6eab4525271de7854ab7479732dce9 /arch/nios2
parent4192b8c35851afd2ac0731b851711fc12ffe888d (diff)
downloadtalos-obmc-uboot-e900298ea4798cfb82cf89bdcf255f3614a5e1d8.tar.gz
talos-obmc-uboot-e900298ea4798cfb82cf89bdcf255f3614a5e1d8.zip
nios2: enlarge the code relocation range
As we will use u-boot-dtb.bin, the code relocation range should be adjusted to accommodate the additional dtb. It might be overkilled to look into dtb header to find the dtb size, so we will simply use CONFIG_SYS_MONITOR_LEN. Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Diffstat (limited to 'arch/nios2')
-rw-r--r--arch/nios2/cpu/start.S5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/nios2/cpu/start.S b/arch/nios2/cpu/start.S
index 9e440c2136..f80b4f3a52 100644
--- a/arch/nios2/cpu/start.S
+++ b/arch/nios2/cpu/start.S
@@ -73,8 +73,9 @@ _cur: movhi r5, %hi(_cur - _start)
ori r5, r5, %lo(_start) /* r5 <- linked _start */
beq r4, r5, 3f
- movhi r6, %hi(_edata)
- ori r6, r6, %lo(_edata)
+ movhi r6, %hi(CONFIG_SYS_MONITOR_LEN)
+ ori r6, r6, %lo(CONFIG_SYS_MONITOR_LEN)
+ add r6, r6, r5
2: ldwio r7, 0(r4)
addi r4, r4, 4
stwio r7, 0(r5)
OpenPOWER on IntegriCloud