diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-16 17:08:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-16 17:08:53 -0500 |
| commit | a643fc7253261be2275c02cb33fa7bf4bfc8cdc4 (patch) | |
| tree | a1dfb201555dd0082204e8a203e58690f099f501 /arch/xtensa/include/asm/vectors.h | |
| parent | 0db2812a5240f2663b92d8d4b761122dd2e0c6c3 (diff) | |
| parent | 1f2fdbd0078cb2ad4251768e8c0e0bb652a2cbd6 (diff) | |
Merge tag 'xtensa-next-20141215' of git://github.com/czankel/xtensa-linux
Pull Xtensa fixes from Chris Zankel:
- fix nommu support
- remove s6000 variant and s6105 platform
- fix permissions for kmapped pages so that copy_to_user_page works with them
- add power management menu to Kconfig to allow use of runtime PM
- disable linker optimizations because of a linker bug
- fix sparse error
* tag 'xtensa-next-20141215' of git://github.com/czankel/xtensa-linux:
xtensa: disable link optimization
xtensa/uaccess: fix sparse errors
xtensa: fix kmap_prot definition
xtensa: add power management menu to Kconfig
xtensa: remove s6000 variant and s6105 platform
xtensa: make PLATFORM_DEFAULT_MEM parameters configurable
xtensa: nommu: clean up memory map dump
xtensa: nommu: reserve memory below PLATFORM_DEFAULT_MEM_START
xtensa: nommu: set up cache and atomctl in initialize_mmu
xtensa: move vecbase SR initialization to _startup
xtensa: nommu: fix uImage load address
xtensa: nommu: fix load address definitions
xtensa: nommu: fix Image.elf reset code and ld script
xtensa: nommu: add MMU dependency to DEBUG_TLB_SANITY
xtensa: nommu: don't build most of the cache flushing code
xtensa: nommu: don't provide arch_get_unmapped_area
xtensa: nommu: provide MAP_UNINITIALIZED definition
xtensa: nommu: provide _PAGE_CHG_MASK definition
xtensa: nommu: provide __invalidate_dcache_page_alias stub
xtensa: nommu: move init_mmu stub to nommu_context.h
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 @@ | |||
| 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 | ||