From e5ec48152ad13ada83c541cdf7f47d5867c506db Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 22 Jan 2017 19:43:11 -0500 Subject: Kconfig: Migrate BOARD_LATE_INIT to a select This option should not really be user selectable. Note that on PowerPC we currently only need BOARD_LATE_INIT when CHAIN_OF_TRUST is enabled so be conditional on that. Signed-off-by: Tom Rini Acked-by: Masahiro Yamada (for UniPhier) --- arch/arm/mach-tegra/tegra114/Kconfig | 1 + arch/arm/mach-tegra/tegra124/Kconfig | 4 ++++ arch/arm/mach-tegra/tegra186/Kconfig | 1 + arch/arm/mach-tegra/tegra20/Kconfig | 10 ++++++++++ arch/arm/mach-tegra/tegra210/Kconfig | 4 ++++ arch/arm/mach-tegra/tegra30/Kconfig | 5 +++++ 6 files changed, 25 insertions(+) (limited to 'arch/arm/mach-tegra') diff --git a/arch/arm/mach-tegra/tegra114/Kconfig b/arch/arm/mach-tegra/tegra114/Kconfig index 1047b9227f7..5f0f909dd3b 100644 --- a/arch/arm/mach-tegra/tegra114/Kconfig +++ b/arch/arm/mach-tegra/tegra114/Kconfig @@ -6,6 +6,7 @@ choice config TARGET_DALMORE bool "NVIDIA Tegra114 Dalmore evaluation board" + select BOARD_LATE_INIT endchoice diff --git a/arch/arm/mach-tegra/tegra124/Kconfig b/arch/arm/mach-tegra/tegra124/Kconfig index df774622838..ca96a263b76 100644 --- a/arch/arm/mach-tegra/tegra124/Kconfig +++ b/arch/arm/mach-tegra/tegra124/Kconfig @@ -6,12 +6,14 @@ choice config TARGET_JETSON_TK1 bool "NVIDIA Tegra124 Jetson TK1 board" + select BOARD_LATE_INIT select CPU_V7_HAS_NONSEC select CPU_V7_HAS_VIRT select ARCH_SUPPORT_PSCI config TARGET_CEI_TK1_SOM bool "Colorado Engineering Inc Tegra124 TK1-som board" + select BOARD_LATE_INIT select CPU_V7_HAS_NONSEC if !SPL_BUILD select CPU_V7_HAS_VIRT if !SPL_BUILD help @@ -23,6 +25,7 @@ config TARGET_CEI_TK1_SOM config TARGET_NYAN_BIG bool "Google/NVIDIA Nyan-big Chromebook" + select BOARD_LATE_INIT help Nyan Big is a Tegra124 clamshell board that is very similar to venice2, but it has a different panel, the sdcard CD and WP @@ -32,6 +35,7 @@ config TARGET_NYAN_BIG config TARGET_VENICE2 bool "NVIDIA Tegra124 Venice2" + select BOARD_LATE_INIT endchoice diff --git a/arch/arm/mach-tegra/tegra186/Kconfig b/arch/arm/mach-tegra/tegra186/Kconfig index 97cf23f31f8..b2e53b58caf 100644 --- a/arch/arm/mach-tegra/tegra186/Kconfig +++ b/arch/arm/mach-tegra/tegra186/Kconfig @@ -9,6 +9,7 @@ choice config TARGET_P2771_0000 bool "NVIDIA Tegra186 P2771-0000 board" + select BOARD_LATE_INIT help P2771-0000 is a P3310 CPU board married to a P2597 I/O board. The combination contains SoC, DRAM, eMMC, SD card slot, HDMI, USB diff --git a/arch/arm/mach-tegra/tegra20/Kconfig b/arch/arm/mach-tegra/tegra20/Kconfig index 1bb8dff5b23..99445a4f26e 100644 --- a/arch/arm/mach-tegra/tegra20/Kconfig +++ b/arch/arm/mach-tegra/tegra20/Kconfig @@ -6,33 +6,43 @@ choice config TARGET_HARMONY bool "NVIDIA Tegra20 Harmony evaluation board" + select BOARD_LATE_INIT config TARGET_MEDCOM_WIDE bool "Avionic Design Medcom-Wide board" + select BOARD_LATE_INIT config TARGET_PAZ00 bool "Paz00 board" + select BOARD_LATE_INIT config TARGET_PLUTUX bool "Avionic Design Plutux board" + select BOARD_LATE_INIT config TARGET_SEABOARD bool "NVIDIA Seaboard" + select BOARD_LATE_INIT config TARGET_TEC bool "Avionic Design Tamonten Evaluation Carrier" + select BOARD_LATE_INIT config TARGET_TRIMSLICE bool "Compulab TrimSlice board" + select BOARD_LATE_INIT config TARGET_VENTANA bool "NVIDIA Tegra20 Ventana evaluation board" + select BOARD_LATE_INIT config TARGET_WHISTLER bool "NVIDIA Tegra20 Whistler evaluation board" + select BOARD_LATE_INIT config TARGET_COLIBRI_T20 bool "Toradex Colibri T20 board" + select BOARD_LATE_INIT endchoice diff --git a/arch/arm/mach-tegra/tegra210/Kconfig b/arch/arm/mach-tegra/tegra210/Kconfig index 055fb124d8b..3637473051b 100644 --- a/arch/arm/mach-tegra/tegra210/Kconfig +++ b/arch/arm/mach-tegra/tegra210/Kconfig @@ -5,6 +5,7 @@ choice config TARGET_E2220_1170 bool "NVIDIA Tegra210 E2220-1170 board" + select BOARD_LATE_INIT help E2220-1170 is a Tegra210 bringup board with onboard SoC, DRAM, eMMC, SD card slot, HDMI, USB micro-B port, and sockets for various @@ -12,6 +13,7 @@ config TARGET_E2220_1170 config TARGET_P2371_0000 bool "NVIDIA Tegra210 P2371-0000 board" + select BOARD_LATE_INIT help P2371-0000 is a P2581 or P2530 CPU board married to a P2595 I/O board. The combination contains SoC, DRAM, eMMC, SD card slot, @@ -20,6 +22,7 @@ config TARGET_P2371_0000 config TARGET_P2371_2180 bool "NVIDIA Tegra210 P2371-2180 (Jetson TX1) board" + select BOARD_LATE_INIT help P2371-2180 (Jetson TX1 developer kit) is a P2180 CPU board married to a P2597 I/O board. The combination contains SoC, DRAM, eMMC, SD @@ -28,6 +31,7 @@ config TARGET_P2371_2180 config TARGET_P2571 bool "NVIDIA Tegra210 P2571 base board" + select BOARD_LATE_INIT help P2571 is a P2530 married to a P1963 I/O board diff --git a/arch/arm/mach-tegra/tegra30/Kconfig b/arch/arm/mach-tegra/tegra30/Kconfig index e78331e4cb3..85b8ce294f2 100644 --- a/arch/arm/mach-tegra/tegra30/Kconfig +++ b/arch/arm/mach-tegra/tegra30/Kconfig @@ -6,18 +6,23 @@ choice config TARGET_APALIS_T30 bool "Toradex Apalis T30 board" + select BOARD_LATE_INIT config TARGET_BEAVER bool "NVIDIA Tegra30 Beaver evaluation board" + select BOARD_LATE_INIT config TARGET_CARDHU bool "NVIDIA Tegra30 Cardhu evaluation board" + select BOARD_LATE_INIT config TARGET_COLIBRI_T30 bool "Toradex Colibri T30 board" + select BOARD_LATE_INIT config TARGET_TEC_NG bool "Avionic Design TEC-NG board" + select BOARD_LATE_INIT endchoice -- cgit v1.2.3