Tegra: Rework KConfig options to allow 64-bit builds (T210)

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>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ae8429ebcc14eea194805373e590e66fd76c6bb0..7e8e1e1cd45cd75ee99b1cf3a0925a152bdc1f0f 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -770,17 +770,6 @@ config ARCH_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 54bd648ed76a5298e64b3656a8b6014d58835164..7533e5708a58ff0d2dfdfde5b539d150374633df 100644 (file)
--- 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