From: Max Filippov <jcmvbkbc@gmail.com>
Date: Fri, 3 Oct 2014 15:04:59 +0000 (+0400)
Subject: xtensa: nommu: fix uImage load address
X-Git-Tag: v3.19-rc1~60^2~4^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4f9846da76c854dcd13a5ac00826b599ad09745;p=thirdparty%2Fkernel%2Flinux.git

xtensa: nommu: fix uImage load address

Use the same offset from the default physical memory start address as in
LOAD_MEMORY_ADDRESS definition.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---

diff --git a/arch/xtensa/boot/boot-uboot/Makefile b/arch/xtensa/boot/boot-uboot/Makefile
index 545759819ef9b..403fcf23405cf 100644
--- a/arch/xtensa/boot/boot-uboot/Makefile
+++ b/arch/xtensa/boot/boot-uboot/Makefile
@@ -4,11 +4,15 @@
 # for more details.
 #
 
+ifdef CONFIG_MMU
 ifdef CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX
 UIMAGE_LOADADDR = 0x00003000
 else
 UIMAGE_LOADADDR = 0xd0003000
 endif
+else
+UIMAGE_LOADADDR = $(shell printf "0x%x" $$(( ${CONFIG_DEFAULT_MEM_START} + 0x3000 )) )
+endif
 UIMAGE_COMPRESSION = gzip
 
 $(obj)/../uImage: vmlinux.bin.gz FORCE