Commit ddd960e6 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Tom Rini

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: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Cc: Tom Warren <twarren@nvidia.com>
parent 44dcb403
......@@ -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"
......
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
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
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
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
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
......@@ -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 */
......
......@@ -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.) */
......
......@@ -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>
......
......@@ -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>
......
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"
......
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"
......
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"
......
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"
......
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"
......
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"
......
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"
......
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"
......
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"
......
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"
......
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"
......
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"
......
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"
......
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"
......
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"
......
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"
......
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"
......
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA30=y
+S:CONFIG_TARGET_BEAVER=y
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA30=y
+S:CONFIG_TARGET_CARDHU=y
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_COLIBRI_T20_IRIS=y
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA30=y
+S:CONFIG_TARGET_COLIBRI_T30=y
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA114=y
+S:CONFIG_TARGET_DALMORE=y
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_HARMONY=y
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA124=y
+S:CONFIG_TARGET_JETSON_TK1=y
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_MEDCOM_WIDE=y
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_PAZ00=y
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_PLUTUX=y
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_SEABOARD=y
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA30=y
+S:CONFIG_TARGET_TEC_NG=y
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_TEC=y
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_TRIMSLICE=y