diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2014-10-03 11:04:59 -0400 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2014-10-21 05:28:54 -0400 |
| commit | a4f9846da76c854dcd13a5ac00826b599ad09745 (patch) | |
| tree | fff5277fc347d6409213963d0bdd64e95dd2d15d | |
| parent | 72bb305fdcb7b6ee14a283016e32f6bf4c864b44 (diff) | |
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>
| -rw-r--r-- | arch/xtensa/boot/boot-uboot/Makefile | 4 |
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 @@ | |||
| 4 | # for more details. | 4 | # for more details. |
| 5 | # | 5 | # |
| 6 | 6 | ||
| 7 | ifdef CONFIG_MMU | ||
| 7 | ifdef CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX | 8 | ifdef CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX |
| 8 | UIMAGE_LOADADDR = 0x00003000 | 9 | UIMAGE_LOADADDR = 0x00003000 |
| 9 | else | 10 | else |
| 10 | UIMAGE_LOADADDR = 0xd0003000 | 11 | UIMAGE_LOADADDR = 0xd0003000 |
| 11 | endif | 12 | endif |
| 13 | else | ||
| 14 | UIMAGE_LOADADDR = $(shell printf "0x%x" $$(( ${CONFIG_DEFAULT_MEM_START} + 0x3000 )) ) | ||
| 15 | endif | ||
| 12 | UIMAGE_COMPRESSION = gzip | 16 | UIMAGE_COMPRESSION = gzip |
| 13 | 17 | ||
| 14 | $(obj)/../uImage: vmlinux.bin.gz FORCE | 18 | $(obj)/../uImage: vmlinux.bin.gz FORCE |