Moved Tegra config options to mach-tegra/Kconfig so that both 32-bit and 64-bit builds can co-exist for Tegra SoCs.
T210 will be 64-bit only (no SPL) and will require a 32-bit AVP/BPMP loader.
Signed-off-by: Tom Warren twarren@nvidia.com --- Changes in V3: - used common ARMV7 Kconfig option for 32-bit T210 Tegra SoCs Changes in V2: None
arch/arm/Kconfig | 11 ----------- arch/arm/mach-tegra/Kconfig | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 506463c..20ab398 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -681,17 +681,6 @@ config TARGET_XILINX_ZYNQMP
config TEGRA bool "NVIDIA Tegra" - select SUPPORT_SPL - select SPL - select OF_CONTROL - select SPL_DISABLE_OF_CONTROL - select CPU_V7 - select DM - select DM_SPI_FLASH - select DM_SERIAL - select DM_I2C - select DM_SPI - select DM_GPIO
config TARGET_VEXPRESS64_AEMV8A bool "Support vexpress_aemv8a" diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 54bd648..7533e57 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -1,20 +1,38 @@ if TEGRA
+config TEGRA_ARMV7_COMMON + bool "Tegra 32-bit" + select SUPPORT_SPL + select SPL + select OF_CONTROL + select SPL_DISABLE_OF_CONTROL + select CPU_V7 + select DM + select DM_SPI_FLASH + select DM_SERIAL + select DM_I2C + select DM_SPI + select DM_GPIO + choice prompt "Tegra SoC select" optional
config TEGRA20 bool "Tegra20 family" + select TEGRA_ARMV7_COMMON
config TEGRA30 bool "Tegra30 family" + select TEGRA_ARMV7_COMMON
config TEGRA114 bool "Tegra114 family" + select TEGRA_ARMV7_COMMON
config TEGRA124 bool "Tegra124 family" + select TEGRA_ARMV7_COMMON
endchoice