diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2014-10-02 22:57:31 +0200 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2014-10-21 11:28:53 +0200 |
| commit | 72bb305fdcb7b6ee14a283016e32f6bf4c864b44 (patch) | |
| tree | b67f51c8c3baa24d4f61e9091f5eb0bd8cdf74ca | |
| parent | xtensa: nommu: fix Image.elf reset code and ld script (diff) | |
| download | linux-72bb305fdcb7b6ee14a283016e32f6bf4c864b44.tar.xz linux-72bb305fdcb7b6ee14a283016e32f6bf4c864b44.zip | |
xtensa: nommu: fix load address definitions
Change KERNELOFFSET, LOAD_MEMORY_ADDRESS and VIRTUAL_MEMORY_ADDRESS to be
relative to the start of physical memory in noMMU configuration, as
there's no uniform memory remapping to KSEG starting at 0xd0000000.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
| -rw-r--r-- | arch/xtensa/include/asm/vectors.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/xtensa/include/asm/vectors.h b/arch/xtensa/include/asm/vectors.h index f74ddfbb92ef..a46c53f36113 100644 --- a/arch/xtensa/include/asm/vectors.h +++ b/arch/xtensa/include/asm/vectors.h @@ -19,6 +19,7 @@ #define _XTENSA_VECTORS_H #include <variant/core.h> +#include <platform/hardware.h> #define XCHAL_KIO_CACHED_VADDR 0xe0000000 #define XCHAL_KIO_BYPASS_VADDR 0xf0000000 @@ -51,13 +52,13 @@ /* MMU Not being used - Virtual == Physical */ /* VECBASE */ - #define VIRTUAL_MEMORY_ADDRESS 0x00002000 + #define VIRTUAL_MEMORY_ADDRESS (PLATFORM_DEFAULT_MEM_START + 0x2000) /* Location of the start of the kernel text, _start */ - #define KERNELOFFSET 0x00003000 + #define KERNELOFFSET (PLATFORM_DEFAULT_MEM_START + 0x3000) /* Loaded just above possibly live vectors */ - #define LOAD_MEMORY_ADDRESS 0x00003000 + #define LOAD_MEMORY_ADDRESS (PLATFORM_DEFAULT_MEM_START + 0x3000) #endif /* CONFIG_MMU */ |