From: Thierry Reding treding@nvidia.com
Move various selects from the TEGRA symbol to the symbols for 32-bit Tegra boards. This is necessary because these settings do not extend to U-Boot for 64-bit Tegra SoCs. Also tie the private libgcc build to SPL, it isn't needed on 64-bit Tegra.
Cc: Tom Warren twarren@nvidia.com Signed-off-by: Thierry Reding treding@nvidia.com --- arch/arm/Kconfig | 4 ---- arch/arm/mach-tegra/Kconfig | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b9ebee104628..40d2fac32e91 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -620,10 +620,6 @@ config TARGET_XILINX_ZYNQMP
config TEGRA bool "NVIDIA Tegra" - select SUPPORT_SPL - select SPL - select OF_CONTROL - select CPU_V7
config TARGET_VEXPRESS64_AEMV8A bool "Support vexpress_aemv8a" diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index fccfd79648ac..9b54a4b141f8 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -5,15 +5,31 @@ choice
config TEGRA20 bool "Tegra20 family" + select SUPPORT_SPL + select SPL + select OF_CONTROL + select CPU_V7
config TEGRA30 bool "Tegra30 family" + select SUPPORT_SPL + select SPL + select OF_CONTROL + select CPU_V7
config TEGRA114 bool "Tegra114 family" + select SUPPORT_SPL + select SPL + select OF_CONTROL + select CPU_V7
config TEGRA124 bool "Tegra124 family" + select SUPPORT_SPL + select SPL + select OF_CONTROL + select CPU_V7
endchoice
@@ -24,6 +40,7 @@ config SYS_MALLOC_F_LEN default 0x1800
config USE_PRIVATE_LIBGCC + depends on SPL default y
config DM