diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2020-02-01 05:11:24 +0100 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2020-02-05 06:57:02 +0100 |
| commit | 5e4417f921238b5acf101bfcd59a7b3463fb2dbd (patch) | |
| tree | d4d46c0c679937e483f4a2de6e105a5f6afbcbec /arch/xtensa/kernel/setup.c | |
| parent | xtensa: separate SMP and XIP support (diff) | |
| download | linux-5e4417f921238b5acf101bfcd59a7b3463fb2dbd.tar.xz linux-5e4417f921238b5acf101bfcd59a7b3463fb2dbd.zip | |
xtensa: reorganize vectors placement
Allow vectors to be either merged into the kernel .text or put at a
fixed virtual address independently of XIP option. Drop option that
puts vectors at a fixed offset from the kernel text. Add choice to
Kconfig.
Vectors at fixed virtual address may be useful for XIP-aware MTD support
and for noMMU configurations with available IRAM. Configurations without
VECBASE register must put their vectors at specific locations regardless
of the selected option. All other configurations should happily use
merged vectors.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'arch/xtensa/kernel/setup.c')
| -rw-r--r-- | arch/xtensa/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index fefbdce1db99..1e9b9e7d9583 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -349,7 +349,7 @@ void __init setup_arch(char **cmdline_p) mem_reserve(__pa(_xip_start), __pa(_xip_end)); #endif -#ifdef CONFIG_VECTORS_OFFSET +#ifdef CONFIG_VECTORS_ADDR mem_reserve(__pa(&_WindowVectors_text_start), __pa(&_WindowVectors_text_end)); @@ -388,7 +388,7 @@ void __init setup_arch(char **cmdline_p) __pa(&_Level6InterruptVector_text_end)); #endif -#endif /* CONFIG_VECTORS_OFFSET */ +#endif /* CONFIG_VECTORS_ADDR */ #ifdef CONFIG_SMP mem_reserve(__pa(&_SecondaryResetVector_text_start), |