From 27e69fe99ac102c626a251e2e1efb7e17d73171c Mon Sep 17 00:00:00 2001 From: Svyatoslav Ryhel Date: Mon, 11 Dec 2023 11:29:40 +0200 Subject: [PATCH] ARM: tegra124: convert TEGRA_SUPPORT_NON_SECURE into Kconfig Signed-off-by: Svyatoslav Ryhel --- README | 7 ------- arch/arm/mach-tegra/Kconfig | 7 +++++++ arch/arm/mach-tegra/board.c | 3 --- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/README b/README index 8efaebcf52..5d472ecc85 100644 --- 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 b18885f4c1..fb1a46b780 100644 --- 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 9224743d0e..327d70bd4c 100644 --- 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) { /* -- 2.39.5