summaryrefslogtreecommitdiffstats
path: root/arch/xtensa
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2014-10-03 19:04:59 +0400
committerMax Filippov <jcmvbkbc@gmail.com>2014-10-21 13:28:54 +0400
commita4f9846da76c854dcd13a5ac00826b599ad09745 (patch)
treefff5277fc347d6409213963d0bdd64e95dd2d15d /arch/xtensa
parent72bb305fdcb7b6ee14a283016e32f6bf4c864b44 (diff)
downloadlinux-a4f9846da76c854dcd13a5ac00826b599ad09745.tar.bz2
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>
Diffstat (limited to 'arch/xtensa')
-rw-r--r--arch/xtensa/boot/boot-uboot/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/xtensa/boot/boot-uboot/Makefile b/arch/xtensa/boot/boot-uboot/Makefile
index 545759819ef9..403fcf23405c 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