arm: Introduce new CONFIG_SPL_SYS_NO_VECTOR_TABLE option

Move OMAP4 specific option for disabling overwriting vector table into
config option CONFIG_SPL_SYS_NO_VECTOR_TABLE.

Signed-off-by: Pali Rohár <pali@kernel.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index efe33a58e1eff272a5884f71bec6a224cae2c08f..10726eae347608d6024c4d86fd1e1932d926516d 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -57,6 +57,10 @@ config SYS_INIT_SP_BSS_OFFSET
          that the early malloc region, global data (gd), and early stack usage
          do not overlap any appended DTB.
 
+config SPL_SYS_NO_VECTOR_TABLE
+       depends on SPL
+       bool
+
 config LINUX_KERNEL_IMAGE_HEADER
        depends on ARM64
        bool

diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index af87a5432ae58f2f74cd7240aed1de8606b0f5cb..37036128a785454f957f9a5553d2b18b26a493b6 100644 (file)
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -97,12 +97,10 @@ switch_to_hypervisor_ret:
        orr     r0, r0, #0xc0           @ disable FIQ and IRQ
        msr     cpsr,r0
 
+#if !CONFIG_IS_ENABLED(SYS_NO_VECTOR_TABLE)
 /*
  * Setup vector:
- * (OMAP4 spl TEXT_BASE is not 32 byte aligned.
- * Continue to use ROM code vector only in OMAP4 spl)
  */
-#if !(defined(CONFIG_OMAP44XX) && defined(CONFIG_SPL_BUILD))
        /* Set V=0 in CP15 SCTLR register - for VBAR to point to vector */
        mrc     p15, 0, r0, c1, c0, 0   @ Read CP15 SCTLR Register
        bic     r0, #CR_V               @ V = 0

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 263142683b04757dc32c517a9ac174bd41f204c0..e1b9180a3bb3a4b1ff49c5465d3e48d6b35b4cf9 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -32,6 +32,7 @@ config OMAP34XX
 config OMAP44XX
        bool "OMAP44XX SoC"
        select SPL_USE_TINY_PRINTF
+       select SPL_SYS_NO_VECTOR_TABLE if SPL
        imply NAND_OMAP_ELM
        imply NAND_OMAP_GPMC
        imply SPL_DISPLAY_PRINT