3 files changed, 18 insertions, 1 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2673fee3281c..ea7640af0f1e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -95,7 +95,7 @@ config ARCH_MTD_XIP
 
 config VECTORS_BASE
         hex
-        default 0xffff0000 if MMU
+        default 0xffff0000 if MMU || CPU_HIGH_VECTOR
         default DRAM_BASE if REMAP_VECTORS_TO_RAM
         default 0x00000000
         help
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S
index 698a537915dd..f359a189dcf2 100644
--- a/arch/arm/kernel/head-nommu.S
+++ b/arch/arm/kernel/head-nommu.S
@@ -77,6 +77,11 @@ __after_proc_init:
 #ifdef CONFIG_CPU_ICACHE_DISABLE
         bic     r0, r0, #CR_I
 #endif
+#ifdef CONFIG_CPU_HIGH_VECTOR
+        orr     r0, r0, #CR_V
+#else
+        bic     r0, r0, #CR_V
+#endif
         mcr     p15, 0, r0, c1, c0, 0           @ write control reg
 #endif /* CONFIG_CPU_CP15 */
 
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 6c1bd424ea61..c0bfb8212b77 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -524,6 +524,18 @@ config CPU_BIG_ENDIAN
           port must properly enable any big-endian related features
           of your chipset/board/processor.
 
+config CPU_HIGH_VECTOR
+        depends !MMU && CPU_CP15 && !CPU_ARM740T
+        bool "Select the High exception vector"
+        default n
+        help
+          Say Y here to select high exception vector(0xFFFF0000~).
+          The exception vector can be vary depending on the platform
+          design in nommu mode. If your platform needs to select
+          high exception vector, say Y.
+          Otherwise or if you are unsure, say N, and the low exception
+          vector (0x00000000~) will be used.
+
 config CPU_ICACHE_DISABLE
         bool "Disable I-Cache (I-bit)"
         depends on CPU_CP15 && !(CPU_ARM610 || CPU_ARM710 || CPU_ARM720T || CPU_ARM740T || CPU_XSCALE || CPU_XSC3)