diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2014-10-04 03:12:27 +0200 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2014-10-21 11:28:55 +0200 |
| commit | 53490121e9ffa3e6314137af016cde8ac83c9bb4 (patch) | |
| tree | a255f95a198f91c3a4edd24e5858a7a753586200 /arch | |
| parent | xtensa: nommu: fix uImage load address (diff) | |
| download | linux-53490121e9ffa3e6314137af016cde8ac83c9bb4.tar.xz linux-53490121e9ffa3e6314137af016cde8ac83c9bb4.zip | |
xtensa: move vecbase SR initialization to _startup
Instead of initializing vecbase in initialize_mmu macro, which may be
expanded either in Image.elf reset vector hadler or in the kernel
head.S, both times only when CONFIG_MMU is enabled, do this
initialization once in _startup function.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/xtensa/include/asm/initialize_mmu.h | 3 | ||||
| -rw-r--r-- | arch/xtensa/kernel/head.S | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/xtensa/include/asm/initialize_mmu.h b/arch/xtensa/include/asm/initialize_mmu.h index 600781edc8a3..cdac5584ec0c 100644 --- a/arch/xtensa/include/asm/initialize_mmu.h +++ b/arch/xtensa/include/asm/initialize_mmu.h @@ -141,9 +141,6 @@ jx a4 1: - movi a2, VECBASE_RESET_VADDR - wsr a2, vecbase - /* Step 5: remove temporary mapping. */ idtlb a7 iitlb a7 diff --git a/arch/xtensa/kernel/head.S b/arch/xtensa/kernel/head.S index aeeb3cc8a410..15a461e2a0ed 100644 --- a/arch/xtensa/kernel/head.S +++ b/arch/xtensa/kernel/head.S @@ -112,6 +112,11 @@ ENTRY(_startup) movi a0, 0 +#if XCHAL_HAVE_VECBASE + movi a2, VECBASE_RESET_VADDR + wsr a2, vecbase +#endif + /* Clear debugging registers. */ #if XCHAL_HAVE_DEBUG |