diff options
author | Max Filippov <jcmvbkbc@gmail.com> | 2016-04-11 20:07:30 +0200 |
---|---|---|
committer | Max Filippov <jcmvbkbc@gmail.com> | 2016-07-24 05:33:57 +0200 |
commit | f1883aa7d63e3be92ad18da7a1bfc6c9b15c4f9a (patch) | |
tree | 86839f71ee3af439a1a43ca548957728568a1aa3 /arch/xtensa/include/asm/vectors.h | |
parent | xtensa: fix __ffs result type (diff) | |
download | linux-f1883aa7d63e3be92ad18da7a1bfc6c9b15c4f9a.tar.xz linux-f1883aa7d63e3be92ad18da7a1bfc6c9b15c4f9a.zip |
xtensa: move kernel mapping addresses into kmem_layout.h
Create a header dedicated to memory layout definitions. Include it from
places where these definitions are needed.
Express vmalloc area address, VIRTUAL_MEMORY_ADDRESS and KERNELOFFSET
through KSEG address.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'arch/xtensa/include/asm/vectors.h')
-rw-r--r-- | arch/xtensa/include/asm/vectors.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/xtensa/include/asm/vectors.h b/arch/xtensa/include/asm/vectors.h index 288c776736d3..482171051ff0 100644 --- a/arch/xtensa/include/asm/vectors.h +++ b/arch/xtensa/include/asm/vectors.h @@ -20,6 +20,7 @@ #include <variant/core.h> #include <platform/hardware.h> +#include <asm/kmem_layout.h> #if XCHAL_HAVE_PTP_MMU #define XCHAL_KIO_CACHED_VADDR 0xe0000000 @@ -48,10 +49,10 @@ static inline unsigned long xtensa_get_kio_paddr(void) #if defined(CONFIG_MMU) /* Will Become VECBASE */ -#define VIRTUAL_MEMORY_ADDRESS 0xD0000000 +#define VIRTUAL_MEMORY_ADDRESS XCHAL_KSEG_CACHED_VADDR /* Image Virtual Start Address */ -#define KERNELOFFSET 0xD0003000 +#define KERNELOFFSET (XCHAL_KSEG_CACHED_VADDR + 0x3000) #if defined(XCHAL_HAVE_PTP_MMU) && XCHAL_HAVE_PTP_MMU && XCHAL_HAVE_SPANNING_WAY /* MMU v3 - XCHAL_HAVE_PTP_MMU == 1 */ |