leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tegra: kconfig: move board select menu and common settings

Browse Source 
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>
This commit is contained in:
Masahiro Yamada 2014-08-31 07:10:56 +09:00 committed by Tom Rini
parent 44dcb4036b
commit ddd960e6c4
45 changed files with 190 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
arch/arm/Kconfig
View File

@ -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"

30
arch/arm/cpu/armv7/tegra-common/Kconfig Normal file
View File

@ -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

17
arch/arm/cpu/armv7/tegra114/Kconfig Normal file
View File

@ -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

21
arch/arm/cpu/armv7/tegra124/Kconfig Normal file
View File

@ -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

53
arch/arm/cpu/armv7/tegra20/Kconfig Normal file
View File

@ -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

29
arch/arm/cpu/armv7/tegra30/Kconfig Normal file
View File

@ -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

2
arch/arm/include/asm/arch-tegra114/tegra.h
View File

@ -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 */

2
arch/arm/include/asm/arch-tegra124/tegra.h
View File

@ -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.) */

2
arch/arm/include/asm/arch-tegra20/tegra.h
View File

@ -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>

2
arch/arm/include/asm/arch-tegra30/tegra.h
View File

@ -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>

9
board/avionic-design/medcom-wide/Kconfig
View File

@ -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"

9
board/avionic-design/plutux/Kconfig
View File

@ -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"

9
board/avionic-design/tec-ng/Kconfig
View File

@ -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"

9
board/avionic-design/tec/Kconfig
View File

@ -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"

9
board/compal/paz00/Kconfig
View File

@ -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"

9
board/compulab/trimslice/Kconfig
View File

@ -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"

9
board/nvidia/beaver/Kconfig
View File

@ -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"

9
board/nvidia/cardhu/Kconfig
View File

@ -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"

9
board/nvidia/dalmore/Kconfig
View File

@ -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"

9
board/nvidia/harmony/Kconfig
View File

@ -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"

9
board/nvidia/jetson-tk1/Kconfig
View File

@ -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"

9
board/nvidia/seaboard/Kconfig
View File

@ -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"

9
board/nvidia/venice2/Kconfig
View File

@ -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"

9
board/nvidia/ventana/Kconfig
View File

@ -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"

9
board/nvidia/whistler/Kconfig
View File

@ -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"

9
board/toradex/colibri_t20_iris/Kconfig
View File

@ -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"

9
board/toradex/colibri_t30/Kconfig
View File

@ -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"

3
configs/beaver_defconfig
View File

@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA30=y
+S:CONFIG_TARGET_BEAVER=y

3
configs/cardhu_defconfig
View File

@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA30=y
+S:CONFIG_TARGET_CARDHU=y

3
configs/colibri_t20_iris_defconfig
View File

@ -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

3
configs/colibri_t30_defconfig
View File

@ -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

3
configs/dalmore_defconfig
View File

@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA114=y
+S:CONFIG_TARGET_DALMORE=y

3
configs/harmony_defconfig
View File

@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_HARMONY=y

3
configs/jetson-tk1_defconfig
View File

@ -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

3
configs/medcom-wide_defconfig
View File

@ -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

3
configs/paz00_defconfig
View File

@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_PAZ00=y

3
configs/plutux_defconfig
View File

@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_PLUTUX=y

3
configs/seaboard_defconfig
View File

@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_SEABOARD=y

3
configs/tec-ng_defconfig
View File

@ -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

3
configs/tec_defconfig
View File

@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_TEC=y

3
configs/trimslice_defconfig
View File

@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_TRIMSLICE=y

3
configs/venice2_defconfig
View File

@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA124=y
+S:CONFIG_TARGET_VENICE2=y

3
configs/ventana_defconfig
View File

@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_VENTANA=y

3
configs/whistler_defconfig
View File

@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_TEGRA=y
+S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_WHISTLER=y

1
include/configs/tegra-common.h
View File

@ -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 */