diff options
| author | Chris Zankel <chris@zankel.net> | 2014-11-10 00:24:48 -0800 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-11-10 00:24:48 -0800 |
| commit | c0d7aa07504a8f4abd7b02b9144c4a92b7565f45 (patch) | |
| tree | a983f40010592c96e43def4f1293392bb3c99f2d /arch/xtensa/include/asm/vectors.h | |
| parent | aeb589734251aaf4c28d80d0efb5da01dc0ce868 (diff) | |
| parent | 4006e565e1500db40b8546dcc6011737bc5d986c (diff) | |
| download | linux-c0d7aa07504a8f4abd7b02b9144c4a92b7565f45.tar.gz linux-c0d7aa07504a8f4abd7b02b9144c4a92b7565f45.tar.bz2 linux-c0d7aa07504a8f4abd7b02b9144c4a92b7565f45.zip | |
Merge tag 'xtensa-for-next-20141021-2' of git://github.com/jcmvbkbc/linux-xtensa into for_next
Xtensa improvements for 3.18:
- fix nommu support;
- remove s6000 variant and s6105 platform.
Diffstat (limited to 'arch/xtensa/include/asm/vectors.h')
| -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 */ |