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 <tho...@wytron.com.tw>
---
 arch/nios2/cpu/start.S | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/nios2/cpu/start.S b/arch/nios2/cpu/start.S
index 971bde8..0b16633 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)
-- 
2.1.4

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to