From ddd960e6c4b8412fa5c5a35f36cc3ac9f3ffbc16 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sun, 31 Aug 2014 07:10:56 +0900 Subject: 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 Acked-by: Stephen Warren Cc: Tom Warren --- configs/beaver_defconfig | 3 ++- configs/cardhu_defconfig | 3 ++- configs/colibri_t20_iris_defconfig | 3 ++- configs/colibri_t30_defconfig | 3 ++- configs/dalmore_defconfig | 3 ++- configs/harmony_defconfig | 3 ++- configs/jetson-tk1_defconfig | 3 ++- configs/medcom-wide_defconfig | 3 ++- configs/paz00_defconfig | 3 ++- configs/plutux_defconfig | 3 ++- configs/seaboard_defconfig | 3 ++- configs/tec-ng_defconfig | 3 ++- configs/tec_defconfig | 3 ++- configs/trimslice_defconfig | 3 ++- configs/venice2_defconfig | 3 ++- configs/ventana_defconfig | 3 ++- configs/whistler_defconfig | 3 ++- 17 files changed, 34 insertions(+), 17 deletions(-) (limited to 'configs') 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 -- cgit v1.2.1