diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index de2454e..75b9208 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -1,18 +1,27 @@
 if TEGRA
 
-config TEGRA_ARMV7_COMMON
-	bool "Tegra 32-bit"
-	select SUPPORT_SPL
-	select SPL
-	select OF_CONTROL
-	select CPU_V7
+config TEGRA_COMMON
+	bool "Tegra common options"
 	select DM
-	select DM_SPI_FLASH
-	select DM_SERIAL
-	select DM_I2C
-	select DM_SPI
 	select DM_GPIO
+	select DM_I2C
 	select DM_KEYBOARD
+	select DM_SERIAL
+	select DM_SPI
+	select DM_SPI_FLASH
+	select OF_CONTROL
+
+config TEGRA_ARMV7_COMMON
+	bool "Tegra 32-bit common options"
+	select CPU_V7
+	select SPL
+	select SUPPORT_SPL
+	select TEGRA_COMMON
+
+config TEGRA_ARMV8_COMMON
+	bool "Tegra 64-bit common options"
+	select ARM64
+	select TEGRA_COMMON
 
 choice
 	prompt "Tegra SoC select"
@@ -36,14 +45,7 @@
 
 config TEGRA210
 	bool "Tegra210 family"
-	select OF_CONTROL
-	select ARM64
-	select DM
-	select DM_SPI_FLASH
-	select DM_SERIAL
-	select DM_I2C
-	select DM_SPI
-	select DM_GPIO
+	select TEGRA_ARMV8_COMMON
 
 endchoice