[v2 03/15] Convert CONFIG_ARMV8_SWITCH_TO_EL1 to Kconfig

[Michal Simek]

On 3/11/22 15:11, Tom Rini wrote:
> This converts the following to Kconfig:
>     CONFIG_ARMV8_SWITCH_TO_EL1
> 
> Cc: Alex Nemirovsky <alex.nemirovsky at cortina-access.com>
> Cc: Marek Vasut <marek.vasut+renesas at gmail.com>
> Cc: Michal Simek <michal.simek at xilinx.com>
> Cc: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
> Cc: Simon Goldschmidt <simon.k.r.goldschmidt at gmail.com>
> Cc: Tien Fong Chee <tien.fong.chee at intel.com>
> Signed-off-by: Tom Rini <trini at konsulko.com>
> ---
> Changes in v2:
> - Don't hide the option, per Michal's request.
> ---
>   arch/arm/cpu/armv8/Kconfig      | 6 ++++++
>   include/configs/xilinx_versal.h | 2 --
>   include/configs/xilinx_zynqmp.h | 2 --
>   3 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig
> index 9967376ecab9..4d4469c88439 100644
> --- a/arch/arm/cpu/armv8/Kconfig
> +++ b/arch/arm/cpu/armv8/Kconfig
> @@ -31,6 +31,12 @@ config ARMV8_SET_SMPEN
>   	  it can be safely enabled when EL2/EL3 initialized SMPEN bit
>   	  or when CPU implementation doesn't include that register.
>   
> +config ARMV8_SWITCH_TO_EL1
> +	bool "Enable switching to running in EL1"
> +	help
> +	  In some circumstances we need to switch to running in EL1.
> +	  Enable this option to have U-Boot switch to EL1.
> +
>   config ARMV8_SPIN_TABLE
>   	bool "Support spin-table enable method"
>   	depends on ARMV8_MULTIENTRY && OF_LIBFDT
> diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h
> index 20f5a7271a20..a8009f236937 100644
> --- a/include/configs/xilinx_versal.h
> +++ b/include/configs/xilinx_versal.h
> @@ -10,8 +10,6 @@
>   #ifndef __XILINX_VERSAL_H
>   #define __XILINX_VERSAL_H
>   
> -/* #define CONFIG_ARMV8_SWITCH_TO_EL1 */
> -
>   /* Generic Interrupt Controller Definitions */
>   #define GICD_BASE	0xF9000000
>   #define GICR_BASE	0xF9080000
> diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
> index 1f0da1a4b3e4..27ec3e06270e 100644
> --- a/include/configs/xilinx_zynqmp.h
> +++ b/include/configs/xilinx_zynqmp.h
> @@ -10,8 +10,6 @@
>   #ifndef __XILINX_ZYNQMP_H
>   #define __XILINX_ZYNQMP_H
>   
> -/* #define CONFIG_ARMV8_SWITCH_TO_EL1 */
> -
>   /* Generic Interrupt Controller Definitions */
>   #define GICD_BASE	0xF9010000
>   #define GICC_BASE	0xF9020000

Reviewed-by: Michal Simek <michal.simek at xilinx.com>

Thanks,
Michal