Merge git://git.denx.de/u-boot-dm

[u-boot] / arch / arm / mach-tegra / Kconfig

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index fb4b32e8b797c8463a7e8affa2ba1b513cb1fb7e..316feba29d60c3b19b19d0a6f0985480c1338f26 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -22,6 +22,7 @@ config TEGRA_IVC
 
 config TEGRA_COMMON
        bool "Tegra common options"
+       select CLK
        select DM
        select DM_ETH
        select DM_GPIO
@@ -31,12 +32,20 @@ config TEGRA_COMMON
        select DM_PCI
        select DM_PCI_COMPAT
        select DM_PWM
+       select DM_RESET
        select DM_SERIAL
        select DM_SPI
        select DM_SPI_FLASH
+       select MISC
        select OF_CONTROL
        select VIDCONSOLE_AS_LCD if DM_VIDEO
 
+config TEGRA_NO_BPMP
+       bool "Tegra common options for SoCs without BPMP"
+       select TEGRA_CAR
+       select TEGRA_CAR_CLOCK
+       select TEGRA_CAR_RESET
+
 config TEGRA_ARMV7_COMMON
        bool "Tegra 32-bit common options"
        select CPU_V7
@@ -44,6 +53,7 @@ config TEGRA_ARMV7_COMMON
        select SUPPORT_SPL
        select TEGRA_COMMON
        select TEGRA_GPIO
+       select TEGRA_NO_BPMP
 
 config TEGRA_ARMV8_COMMON
        bool "Tegra 64-bit common options"
@@ -74,13 +84,11 @@ config TEGRA210
        bool "Tegra210 family"
        select TEGRA_GPIO
        select TEGRA_ARMV8_COMMON
+       select TEGRA_NO_BPMP
 
 config TEGRA186
        bool "Tegra186 family"
-       select CLK
        select DM_MAILBOX
-       select DM_RESET
-       select MISC
        select TEGRA186_BPMP
        select TEGRA186_CLOCK
        select TEGRA186_GPIO