[PATCH u-boot-marvell v2 1/3] arm: Introduce new CONFIG_SPL_SYS_NO_VECTOR_TABLE option

[Stefan Roese]

On 4/6/22 16:20, Pali Rohár wrote:
> 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 at kernel.org>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
>   arch/arm/Kconfig            | 4 ++++
>   arch/arm/cpu/armv7/start.S  | 4 +---
>   arch/arm/mach-omap2/Kconfig | 1 +
>   3 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 4567c183fb84..1be8d4470ec1 100644
> --- 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 af87a5432ae5..37036128a785 100644
> --- 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 263142683b04..e1b9180a3bb3 100644
> --- 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

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de