ARM: tegra124: convert TEGRA_SUPPORT_NON_SECURE into Kconfig

Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>

diff --git a/README b/README
index 8efaebcf5287a11480b9d8ac3fb1539ab86646d7..5d472ecc85b1d0b9ab98c4418b3523b955760b41 100644 (file)
--- a/README
+++ b/README
@@ -300,13 +300,6 @@ The following options need to be configured:
                different from COUNTER_FREQUENCY, and can only be determined
                at run time.
 
-- Tegra SoC options:
-               CONFIG_TEGRA_SUPPORT_NON_SECURE
-
-               Support executing U-Boot in non-secure (NS) mode. Certain
-               impossible actions will be skipped if the CPU is in NS mode,
-               such as ARM architectural timer initialization.
-
 - Linux Kernel Interface:
                CONFIG_OF_LIBFDT
 

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index b18885f4c1f556021e2a9a08b5bf8814e5b4d582..fb1a46b78081dc730edcb24fab51d8c5306d86a3 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -176,6 +176,13 @@ config TEGRA_DISCONNECT_UDC_ON_BOOT
          USB controller when U-Boot boots to avoid leaving a stale USB device
          present.
 
+config TEGRA_SUPPORT_NON_SECURE
+       bool "Support executing U-Boot in non-secure (NS) mode"
+       depends on TEGRA124
+       help
+         Certain impossible actions will be skipped if the CPU is in NS mode,
+         such as ARM architectural timer initialization.
+
 config CI_UDC_HAS_HOSTPC
        def_bool y
        depends on CI_UDC && !TEGRA20

diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index 9224743d0ed0e51e767026a04ecc45ca34cadd6a..327d70bd4cc081abfbba0d4e1f7514c069fc62f6 100644 (file)
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -77,9 +77,6 @@ bool spl_was_boot_source(void)
 }
 
 #if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE)
-#if !defined(CONFIG_TEGRA124)
-#error tegra_cpu_is_non_secure has only been validated on Tegra124
-#endif
 bool tegra_cpu_is_non_secure(void)
 {
        /*