diff options
author | Max Filippov <jcmvbkbc@gmail.com> | 2014-10-02 16:57:31 -0400 |
---|---|---|
committer | Max Filippov <jcmvbkbc@gmail.com> | 2014-10-21 05:28:53 -0400 |
commit | 72bb305fdcb7b6ee14a283016e32f6bf4c864b44 (patch) | |
tree | b67f51c8c3baa24d4f61e9091f5eb0bd8cdf74ca /arch/xtensa | |
parent | ccd0ef38be3b9e0cc6efff407c53c43f648d598b (diff) |
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>
Diffstat (limited to 'arch/xtensa')
-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 @@ | |||
19 | #define _XTENSA_VECTORS_H | 19 | #define _XTENSA_VECTORS_H |
20 | 20 | ||
21 | #include <variant/core.h> | 21 | #include <variant/core.h> |
22 | #include <platform/hardware.h> | ||
22 | 23 | ||
23 | #define XCHAL_KIO_CACHED_VADDR 0xe0000000 | 24 | #define XCHAL_KIO_CACHED_VADDR 0xe0000000 |
24 | #define XCHAL_KIO_BYPASS_VADDR 0xf0000000 | 25 | #define XCHAL_KIO_BYPASS_VADDR 0xf0000000 |
@@ -51,13 +52,13 @@ | |||
51 | /* MMU Not being used - Virtual == Physical */ | 52 | /* MMU Not being used - Virtual == Physical */ |
52 | 53 | ||
53 | /* VECBASE */ | 54 | /* VECBASE */ |
54 | #define VIRTUAL_MEMORY_ADDRESS 0x00002000 | 55 | #define VIRTUAL_MEMORY_ADDRESS (PLATFORM_DEFAULT_MEM_START + 0x2000) |
55 | 56 | ||
56 | /* Location of the start of the kernel text, _start */ | 57 | /* Location of the start of the kernel text, _start */ |
57 | #define KERNELOFFSET 0x00003000 | 58 | #define KERNELOFFSET (PLATFORM_DEFAULT_MEM_START + 0x3000) |
58 | 59 | ||
59 | /* Loaded just above possibly live vectors */ | 60 | /* Loaded just above possibly live vectors */ |
60 | #define LOAD_MEMORY_ADDRESS 0x00003000 | 61 | #define LOAD_MEMORY_ADDRESS (PLATFORM_DEFAULT_MEM_START + 0x3000) |
61 | 62 | ||
62 | #endif /* CONFIG_MMU */ | 63 | #endif /* CONFIG_MMU */ |
63 | 64 | ||