diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3355b3bcaa583013782c0086054bb39936ff8755..65e710ab4b71128fbecf301d2e73f3a0fa3e8344 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -687,17 +687,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 54bd648ed76a5298e64b3656a8b6014d58835164..7533e5708a58ff0d2dfdfde5b539d150374633df 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