tegra: kconfig: move board select menu and common settings

Becuase the board select menu in arch/arm/Kconfig is too big,
move the Tegra board select menu to tegra/Kconfig.

Insert the Tegra SoC select menu between the arch select and the
board select.

 Architecture select
 |-- Tegra Platform (Tegra)
     |- Tegra SoC select (Tegra20 / 30 / 114 / 124)
        |- Board select

Consolidate also common settings (CONFIG_SYS_CPU="armv7" and
CONFIG_SYS_SOC="tegra*") and always "select" CONFIG_SPL as follows:

  config TEGRA
          bool
          select SPL

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Cc: Tom Warren <twarren@nvidia.com>

45 files changed, 190 insertions, 246 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index cac9143f21..c81307a8be 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -671,56 +671,9 @@ config TARGET_VF610TWR
 config ZYNQ
 	bool "Xilinx Zynq Platform"
 
-config TARGET_MEDCOM_WIDE
-	bool "Support medcom-wide"
-
-config TARGET_PLUTUX
-	bool "Support plutux"
-
-config TARGET_TEC
-	bool "Support tec"
-
-config TARGET_PAZ00
-	bool "Support paz00"
-
-config TARGET_TRIMSLICE
-	bool "Support trimslice"
-
-config TARGET_HARMONY
-	bool "Support harmony"
-
-config TARGET_SEABOARD
-	bool "Support seaboard"
-
-config TARGET_VENTANA
-	bool "Support ventana"
-
-config TARGET_WHISTLER
-	bool "Support whistler"
-
-config TARGET_COLIBRI_T20_IRIS
-	bool "Support colibri_t20_iris"
-
-config TARGET_COLIBRI_T30
-	bool "Support Colibri T30"
-
-config TARGET_TEC_NG
-	bool "Support tec-ng"
-
-config TARGET_BEAVER
-	bool "Support beaver"
-
-config TARGET_CARDHU
-	bool "Support cardhu"
-
-config TARGET_DALMORE
-	bool "Support dalmore"
-
-config TARGET_JETSON_TK1
-	bool "Support jetson-tk1"
-
-config TARGET_VENICE2
-	bool "Support venice2"
+config TEGRA
+	bool "NVIDIA Tegra"
+	select SPL
 
 config TARGET_VEXPRESS_AEMV8A
 	bool "Support vexpress_aemv8a"
@@ -775,7 +728,10 @@ config TARGET_JORNADA
 
 endchoice
 
+source "arch/arm/cpu/armv7/tegra-common/Kconfig"
+
 source "arch/arm/cpu/armv7/zynq/Kconfig"
+
 source "board/8dtech/eco5pk/Kconfig"
 source "board/aristainetos/Kconfig"
 source "board/Barix/ipam390/Kconfig"
@@ -818,10 +774,6 @@ source "board/atmel/at91sam9rlek/Kconfig"
 source "board/atmel/at91sam9x5ek/Kconfig"
 source "board/atmel/sama5d3_xplained/Kconfig"
 source "board/atmel/sama5d3xek/Kconfig"
-source "board/avionic-design/medcom-wide/Kconfig"
-source "board/avionic-design/plutux/Kconfig"
-source "board/avionic-design/tec-ng/Kconfig"
-source "board/avionic-design/tec/Kconfig"
 source "board/balloon3/Kconfig"
 source "board/barco/titanium/Kconfig"
 source "board/bluegiga/apx4devkit/Kconfig"
@@ -839,11 +791,9 @@ source "board/cloudengines/pogo_e02/Kconfig"
 source "board/cm4008/Kconfig"
 source "board/cm41xx/Kconfig"
 source "board/comelit/dig297/Kconfig"
-source "board/compal/paz00/Kconfig"
 source "board/compulab/cm_t335/Kconfig"
 source "board/compulab/cm_t35/Kconfig"
 source "board/compulab/cm_t54/Kconfig"
-source "board/compulab/trimslice/Kconfig"
 source "board/congatec/cgtqmx6eval/Kconfig"
 source "board/corscience/tricorder/Kconfig"
 source "board/creative/xfi3/Kconfig"
@@ -915,15 +865,6 @@ source "board/logicpd/zoom1/Kconfig"
 source "board/matrix_vision/mvblx/Kconfig"
 source "board/mpl/vcma9/Kconfig"
 source "board/nokia/rx51/Kconfig"
-source "board/nvidia/beaver/Kconfig"
-source "board/nvidia/cardhu/Kconfig"
-source "board/nvidia/dalmore/Kconfig"
-source "board/nvidia/harmony/Kconfig"
-source "board/nvidia/jetson-tk1/Kconfig"
-source "board/nvidia/seaboard/Kconfig"
-source "board/nvidia/venice2/Kconfig"
-source "board/nvidia/ventana/Kconfig"
-source "board/nvidia/whistler/Kconfig"
 source "board/olimex/mx23_olinuxino/Kconfig"
 source "board/omicron/calimain/Kconfig"
 source "board/overo/Kconfig"
@@ -995,8 +936,6 @@ source "board/ti/tnetv107xevm/Kconfig"
 source "board/timll/devkit3250/Kconfig"
 source "board/timll/devkit8000/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
-source "board/toradex/colibri_t20_iris/Kconfig"
-source "board/toradex/colibri_t30/Kconfig"
 source "board/trizepsiv/Kconfig"
 source "board/ttcontrol/vision2/Kconfig"
 source "board/udoo/Kconfig"
diff --git a/arch/arm/cpu/armv7/tegra-common/Kconfig b/arch/arm/cpu/armv7/tegra-common/Kconfig
new file mode 100644
index 0000000000..8e2153bb83
--- /dev/null
+++ b/arch/arm/cpu/armv7/tegra-common/Kconfig
@@ -0,0 +1,30 @@
+if TEGRA
+
+choice
+	prompt "Tegra SoC select"
+
+config TEGRA20
+	bool "Tegra20 family"
+
+config TEGRA30
+	bool "Tegra30 family"
+
+config TEGRA114
+	bool "Tegra114 family"
+
+config TEGRA124
+	bool "Tegra124 family"
+
+endchoice
+
+config SYS_CPU
+	string
+	default "arm720t" if SPL_BUILD
+	default "armv7" if !SPL_BUILD
+
+source "arch/arm/cpu/armv7/tegra20/Kconfig"
+source "arch/arm/cpu/armv7/tegra30/Kconfig"
+source "arch/arm/cpu/armv7/tegra114/Kconfig"
+source "arch/arm/cpu/armv7/tegra124/Kconfig"
+
+endif
diff --git a/arch/arm/cpu/armv7/tegra114/Kconfig b/arch/arm/cpu/armv7/tegra114/Kconfig
new file mode 100644
index 0000000000..33a22da535
--- /dev/null
+++ b/arch/arm/cpu/armv7/tegra114/Kconfig
@@ -0,0 +1,17 @@
+if TEGRA114
+
+choice
+	prompt "Tegra114 board select"
+
+config TARGET_DALMORE
+	bool "NVIDIA Tegra114 Dalmore evaluation board"
+
+endchoice
+
+config SYS_SOC
+	string
+	default "tegra114"
+
+source "board/nvidia/dalmore/Kconfig"
+
+endif
diff --git a/arch/arm/cpu/armv7/tegra124/Kconfig b/arch/arm/cpu/armv7/tegra124/Kconfig
new file mode 100644
index 0000000000..753f511eda
--- /dev/null
+++ b/arch/arm/cpu/armv7/tegra124/Kconfig
@@ -0,0 +1,21 @@
+if TEGRA124
+
+choice
+	prompt "Tegra124 board select"
+
+config TARGET_JETSON_TK1
+	bool "NVIDIA Tegra124 Jetson TK1 board"
+
+config TARGET_VENICE2
+	bool "NVIDIA Tegra124 Venice2"
+
+endchoice
+
+config SYS_SOC
+	string
+	default "tegra124"
+
+source "board/nvidia/jetson-tk1/Kconfig"
+source "board/nvidia/venice2/Kconfig"
+
+endif
diff --git a/arch/arm/cpu/armv7/tegra20/Kconfig b/arch/arm/cpu/armv7/tegra20/Kconfig
new file mode 100644
index 0000000000..e2e08900b9
--- /dev/null
+++ b/arch/arm/cpu/armv7/tegra20/Kconfig
@@ -0,0 +1,53 @@
+if TEGRA20
+
+choice
+	prompt "Tegra20 board select"
+
+config TARGET_HARMONY
+	bool "NVIDIA Tegra20 Harmony evaluation board"
+
+config TARGET_MEDCOM_WIDE
+	bool "Avionic Design Medcom-Wide board"
+
+config TARGET_PAZ00
+	bool "Paz00 board"
+
+config TARGET_PLUTUX
+	bool "Avionic Design Plutux board"
+
+config TARGET_SEABOARD
+	bool "NVIDIA Seaboard"
+
+config TARGET_TEC
+	bool "Avionic Design Tamonten Evaluation Carrier"
+
+config TARGET_TRIMSLICE
+	bool "Compulab TrimSlice board"
+
+config TARGET_VENTANA
+	bool "NVIDIA Tegra20 Ventana evaluation board"
+
+config TARGET_WHISTLER
+	bool "NVIDIA Tegra20 Whistler evaluation board"
+
+config TARGET_COLIBRI_T20_IRIS
+	bool "Toradex Colibri T20 board"
+
+endchoice
+
+config SYS_SOC
+	string
+	default "tegra20"
+
+source "board/nvidia/harmony/Kconfig"
+source "board/avionic-design/medcom-wide/Kconfig"
+source "board/compal/paz00/Kconfig"
+source "board/avionic-design/plutux/Kconfig"
+source "board/nvidia/seaboard/Kconfig"
+source "board/avionic-design/tec/Kconfig"
+source "board/compulab/trimslice/Kconfig"
+source "board/nvidia/ventana/Kconfig"
+source "board/nvidia/whistler/Kconfig"
+source "board/toradex/colibri_t20_iris/Kconfig"
+
+endif
diff --git a/arch/arm/cpu/armv7/tegra30/Kconfig b/arch/arm/cpu/armv7/tegra30/Kconfig
new file mode 100644
index 0000000000..694e1cd974
--- /dev/null
+++ b/arch/arm/cpu/armv7/tegra30/Kconfig
@@ -0,0 +1,29 @@
+if TEGRA30
+
+choice
+	prompt "Tegra30 board select"
+
+config TARGET_BEAVER
+	bool "NVIDIA Tegra30 Beaver evaluation board"
+
+config TARGET_CARDHU
+	bool "NVIDIA Tegra30 Cardhu evaluation board"
+
+config TARGET_COLIBRI_T30
+	bool "Toradex Colibri T30 board"
+
+config TARGET_TEC_NG
+	bool "Avionic Design TEC-NG board"
+
+endchoice
+
+config SYS_SOC
+	string
+	default "tegra30"
+
+source "board/nvidia/beaver/Kconfig"
+source "board/nvidia/cardhu/Kconfig"
+source "board/toradex/colibri_t30/Kconfig"
+source "board/avionic-design/tec-ng/Kconfig"
+
+endif
diff --git a/arch/arm/include/asm/arch-tegra114/tegra.h b/arch/arm/include/asm/arch-tegra114/tegra.h
index 705ca5758e..5d426b524a 100644
--- a/arch/arm/include/asm/arch-tegra114/tegra.h
+++ b/arch/arm/include/asm/arch-tegra114/tegra.h
@@ -17,8 +17,6 @@
 #ifndef _TEGRA114_H_
 #define _TEGRA114_H_
 
-#define CONFIG_TEGRA114
-
 #define NV_PA_SDRAM_BASE	0x80000000	/* 0x80000000 for real T114 */
 #define NV_PA_TSC_BASE		0x700F0000	/* System Counter TSC regs */
 
diff --git a/arch/arm/include/asm/arch-tegra124/tegra.h b/arch/arm/include/asm/arch-tegra124/tegra.h
index 86ebd19453..db3d837920 100644
--- a/arch/arm/include/asm/arch-tegra124/tegra.h
+++ b/arch/arm/include/asm/arch-tegra124/tegra.h
@@ -8,8 +8,6 @@
 #ifndef _TEGRA124_H_
 #define _TEGRA124_H_
 
-#define CONFIG_TEGRA124
-
 #define NV_PA_SDRAM_BASE	0x80000000
 #define NV_PA_TSC_BASE		0x700F0000	/* System Counter TSC regs */
 #define NV_PA_MC_BASE		0x70019000	/* Mem Ctlr regs (MCB, etc.) */
diff --git a/arch/arm/include/asm/arch-tegra20/tegra.h b/arch/arm/include/asm/arch-tegra20/tegra.h
index 6a4b40ec76..18856ac372 100644
--- a/arch/arm/include/asm/arch-tegra20/tegra.h
+++ b/arch/arm/include/asm/arch-tegra20/tegra.h
@@ -8,8 +8,6 @@
 #ifndef _TEGRA20_H_
 #define _TEGRA20_H_
 
-#define CONFIG_TEGRA20
-
 #define NV_PA_SDRAM_BASE	0x00000000
 
 #include <asm/arch-tegra/tegra.h>
diff --git a/arch/arm/include/asm/arch-tegra30/tegra.h b/arch/arm/include/asm/arch-tegra30/tegra.h
index 4ad8b1c053..c02c5d8500 100644
--- a/arch/arm/include/asm/arch-tegra30/tegra.h
+++ b/arch/arm/include/asm/arch-tegra30/tegra.h
@@ -17,8 +17,6 @@
 #ifndef _TEGRA30_H_
 #define _TEGRA30_H_
 
-#define CONFIG_TEGRA30
-
 #define NV_PA_SDRAM_BASE	0x80000000	/* 0x80000000 for real T30 */
 
 #include <asm/arch-tegra/tegra.h>
diff --git a/board/avionic-design/medcom-wide/Kconfig b/board/avionic-design/medcom-wide/Kconfig
index 2472fe2a4e..16001e4b07 100644
--- a/board/avionic-design/medcom-wide/Kconfig
+++ b/board/avionic-design/medcom-wide/Kconfig
@@ -1,10 +1,5 @@
 if TARGET_MEDCOM_WIDE
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "medcom-wide"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "avionic-design"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "medcom-wide"
diff --git a/board/avionic-design/plutux/Kconfig b/board/avionic-design/plutux/Kconfig
index a697a54477..c9a90247a2 100644
--- a/board/avionic-design/plutux/Kconfig
+++ b/board/avionic-design/plutux/Kconfig
@@ -1,10 +1,5 @@
 if TARGET_PLUTUX
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "plutux"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "avionic-design"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "plutux"
diff --git a/board/avionic-design/tec-ng/Kconfig b/board/avionic-design/tec-ng/Kconfig
index f52eddae76..e6b69e8430 100644
--- a/board/avionic-design/tec-ng/Kconfig
+++ b/board/avionic-design/tec-ng/Kconfig
@@ -1,10 +1,5 @@
 if TARGET_TEC_NG
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "tec-ng"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "avionic-design"
 
-config SYS_SOC
-	string
-	default "tegra30"
-
 config SYS_CONFIG_NAME
 	string
 	default "tec-ng"
diff --git a/board/avionic-design/tec/Kconfig b/board/avionic-design/tec/Kconfig
index d19e3f43c7..fbf7f46976 100644
--- a/board/avionic-design/tec/Kconfig
+++ b/board/avionic-design/tec/Kconfig
@@ -1,10 +1,5 @@
 if TARGET_TEC
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "tec"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "avionic-design"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "tec"
diff --git a/board/compal/paz00/Kconfig b/board/compal/paz00/Kconfig
index 4f0f09fd7e..690d7a7782 100644
--- a/board/compal/paz00/Kconfig
+++ b/board/compal/paz00/Kconfig
@@ -1,10 +1,5 @@
 if TARGET_PAZ00
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "paz00"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "compal"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "paz00"
diff --git a/board/compulab/trimslice/Kconfig b/board/compulab/trimslice/Kconfig
index e545f0cba1..6ae030c737 100644
--- a/board/compulab/trimslice/Kconfig
+++ b/board/compulab/trimslice/Kconfig
@@ -1,10 +1,5 @@
 if TARGET_TRIMSLICE
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "trimslice"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "compulab"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "trimslice"
diff --git a/board/nvidia/beaver/Kconfig b/board/nvidia/beaver/Kconfig
index f05267611f..e487b66f13 100644
--- a/board/nvidia/beaver/Kconfig
+++ b/board/nvidia/beaver/Kconfig
@@ -1,10 +1,5 @@
 if TARGET_BEAVER
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "beaver"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nvidia"
 
-config SYS_SOC
-	string
-	default "tegra30"
-
 config SYS_CONFIG_NAME
 	string
 	default "beaver"
diff --git a/board/nvidia/cardhu/Kconfig b/board/nvidia/cardhu/Kconfig
index 9853114dba..150815f7a6 100644
--- a/board/nvidia/cardhu/Kconfig
+++ b/board/nvidia/cardhu/Kconfig
@@ -1,10 +1,5 @@
 if TARGET_CARDHU
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "cardhu"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nvidia"
 
-config SYS_SOC
-	string
-	default "tegra30"
-
 config SYS_CONFIG_NAME
 	string
 	default "cardhu"
diff --git a/board/nvidia/dalmore/Kconfig b/board/nvidia/dalmore/Kconfig
index 33b78dbf10..9eed19c353 100644
--- a/board/nvidia/dalmore/Kconfig
+++ b/board/nvidia/dalmore/Kconfig
@@ -1,10 +1,5 @@
 if TARGET_DALMORE
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "dalmore"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nvidia"
 
-config SYS_SOC
-	string
-	default "tegra114"
-
 config SYS_CONFIG_NAME
 	string
 	default "dalmore"
diff --git a/board/nvidia/harmony/Kconfig b/board/nvidia/harmony/Kconfig
index 2a3bde4029..7d75f2d271 100644
--- a/board/nvidia/harmony/Kconfig
+++ b/board/nvidia/harmony/Kconfig
@@ -1,10 +1,5 @@
 if TARGET_HARMONY
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "harmony"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nvidia"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "harmony"
diff --git a/board/nvidia/jetson-tk1/Kconfig b/board/nvidia/jetson-tk1/Kconfig
index 22b4c69235..02b46b7a86 100644
--- a/board/nvidia/jetson-tk1/Kconfig
+++ b/board/nvidia/jetson-tk1/Kconfig
@@ -1,10 +1,5 @@
 if TARGET_JETSON_TK1
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "jetson-tk1"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nvidia"
 
-config SYS_SOC
-	string
-	default "tegra124"
-
 config SYS_CONFIG_NAME
 	string
 	default "jetson-tk1"
diff --git a/board/nvidia/seaboard/Kconfig b/board/nvidia/seaboard/Kconfig
index 39c65b5d38..786370226e 100644
--- a/board/nvidia/seaboard/Kconfig
+++ b/board/nvidia/seaboard/Kconfig
@@ -1,10 +1,5 @@
 if TARGET_SEABOARD
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "seaboard"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nvidia"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "seaboard"
diff --git a/board/nvidia/venice2/Kconfig b/board/nvidia/venice2/Kconfig
index 84a7160ab6..993da79d6e 100644
--- a/board/nvidia/venice2/Kconfig
+++ b/board/nvidia/venice2/Kconfig
@@ -1,10 +1,5 @@
 if TARGET_VENICE2
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "venice2"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nvidia"
 
-config SYS_SOC
-	string
-	default "tegra124"
-
 config SYS_CONFIG_NAME
 	string
 	default "venice2"
diff --git a/board/nvidia/ventana/Kconfig b/board/nvidia/ventana/Kconfig
index 59e85c490f..95840a8f06 100644
--- a/board/nvidia/ventana/Kconfig
+++ b/board/nvidia/ventana/Kconfig
@@ -1,10 +1,5 @@
 if TARGET_VENTANA
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "ventana"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nvidia"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "ventana"
diff --git a/board/nvidia/whistler/Kconfig b/board/nvidia/whistler/Kconfig
index f025413c27..113e2ef70e 100644
--- a/board/nvidia/whistler/Kconfig
+++ b/board/nvidia/whistler/Kconfig
@@ -1,10 +1,5 @@
 if TARGET_WHISTLER
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "whistler"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nvidia"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "whistler"
diff --git a/board/toradex/colibri_t20_iris/Kconfig b/board/toradex/colibri_t20_iris/Kconfig
index 334b7e051f..cccdd584c8 100644
--- a/board/toradex/colibri_t20_iris/Kconfig
+++ b/board/toradex/colibri_t20_iris/Kconfig
@@ -1,10 +1,5 @@
 if TARGET_COLIBRI_T20_IRIS
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "colibri_t20_iris"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "toradex"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "colibri_t20_iris"
diff --git a/board/toradex/colibri_t30/Kconfig b/board/toradex/colibri_t30/Kconfig
index fcf5e8ef97..ea6c08a59c 100644
--- a/board/toradex/colibri_t30/Kconfig
+++ b/board/toradex/colibri_t30/Kconfig
@@ -1,10 +1,5 @@
 if TARGET_COLIBRI_T30
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "colibri_t30"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "toradex"
 
-config SYS_SOC
-	string
-	default "tegra30"
-
 config SYS_CONFIG_NAME
 	string
 	default "colibri_t30"
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 0e70f25d8a..7c9d94bbcc 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA30=y
 +S:CONFIG_TARGET_BEAVER=y
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 564ad5a545..bb042b4648 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA30=y
 +S:CONFIG_TARGET_CARDHU=y
diff --git a/configs/colibri_t20_iris_defconfig b/configs/colibri_t20_iris_defconfig
index 8ff246428b..b2a21e186a 100644
--- a/configs/colibri_t20_iris_defconfig
+++ b/configs/colibri_t20_iris_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_COLIBRI_T20_IRIS=y
diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index 32f1d6493f..abb41f3f22 100644
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA30=y
 +S:CONFIG_TARGET_COLIBRI_T30=y
diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index 288b2381ef..70677aac41 100644
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA114=y
 +S:CONFIG_TARGET_DALMORE=y
diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index d25ea5cb19..a52231b655 100644
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_HARMONY=y
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 6926257d89..00eac92319 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA124=y
 +S:CONFIG_TARGET_JETSON_TK1=y
diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
index ddf3437358..e9a3930910 100644
--- a/configs/medcom-wide_defconfig
+++ b/configs/medcom-wide_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_MEDCOM_WIDE=y
diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index 61a536e734..05974eb10c 100644
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_PAZ00=y
diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig
index 672b66c8a5..60e80ffa61 100644
--- a/configs/plutux_defconfig
+++ b/configs/plutux_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_PLUTUX=y
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index c0f078bbdc..516e760dfa 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_SEABOARD=y
diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index 2360d25d2c..e4a31cc054 100644
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA30=y
 +S:CONFIG_TARGET_TEC_NG=y
diff --git a/configs/tec_defconfig b/configs/tec_defconfig
index 1aaa9d183f..62a9542d94 100644
--- a/configs/tec_defconfig
+++ b/configs/tec_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_TEC=y
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index c096c65a88..94f23e3ea4 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_TRIMSLICE=y
diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index 2bfa91db6e..dfc54078ed 100644
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA124=y
 +S:CONFIG_TARGET_VENICE2=y
diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index 75fca961ca..845e24173c 100644
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_VENTANA=y
diff --git a/configs/whistler_defconfig b/configs/whistler_defconfig
index cdc2c90ea6..8c07c184a9 100644
--- a/configs/whistler_defconfig
+++ b/configs/whistler_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_WHISTLER=y
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 717cd61bd6..d27fcebd7c 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -14,7 +14,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_ARMCORTEXA9		/* This is an ARM V7 CPU core */
-#define CONFIG_TEGRA			/* which is a Tegra generic machine */
 #define CONFIG_SYS_L2CACHE_OFF		/* No L2 cache */
 
 #include <asm/arch/tegra.h>		/* get chip and board defs */