Convert CONFIG_ARMV8_SWITCH_TO_EL1 to Kconfig

This converts the following to Kconfig:
   CONFIG_ARMV8_SWITCH_TO_EL1

Cc: Alex Nemirovsky <alex.nemirovsky@cortina-access.com>
Cc: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Cc: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Cc: Tien Fong Chee <tien.fong.chee@intel.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig
index 9967376ecab939e9a6e9ded0b7eddf65b1f260cb..4d4469c88439d1a4a53d11f4c9a7212d625f3c76 100644 (file)
--- 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 20f5a7271a20b2ad5fea0a656e20c3901b6f3ab4..a8009f23693705d7df25d69ba1efd94611ea4af5 100644 (file)
--- 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 1f0da1a4b3e463c853a2b848e8bcd0d735522522..27ec3e06270ecaffdb9637d7cb5bfa446182a005 100644 (file)
--- 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