Merge branch 'master' of git://git.denx.de/u-boot-tegra

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

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 385724394751d0debad40287d6cc70c85554a638..b18a12e34203e9d467d381a05e8e1d2eb36bd8b7 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -9,11 +9,12 @@ config TEGRA_COMMON
        select DM_KEYBOARD
        select DM_PCI
        select DM_PCI_COMPAT
+       select DM_PWM
        select DM_SERIAL
        select DM_SPI
        select DM_SPI_FLASH
        select OF_CONTROL
-       select VIDCONSOLE_AS_LCD
+       select VIDCONSOLE_AS_LCD if DM_VIDEO
 
 config TEGRA_ARMV7_COMMON
        bool "Tegra 32-bit common options"
@@ -21,6 +22,7 @@ config TEGRA_ARMV7_COMMON
        select SPL
        select SUPPORT_SPL
        select TEGRA_COMMON
+       select TEGRA_GPIO
 
 config TEGRA_ARMV8_COMMON
        bool "Tegra 64-bit common options"
@@ -49,6 +51,12 @@ config TEGRA124
 
 config TEGRA210
        bool "Tegra210 family"
+       select TEGRA_GPIO
+       select TEGRA_ARMV8_COMMON
+
+config TEGRA186
+       bool "Tegra186 family"
+       select TEGRA186_GPIO
        select TEGRA_ARMV8_COMMON
 
 endchoice
@@ -74,5 +82,6 @@ source "arch/arm/mach-tegra/tegra30/Kconfig"
 source "arch/arm/mach-tegra/tegra114/Kconfig"
 source "arch/arm/mach-tegra/tegra124/Kconfig"
 source "arch/arm/mach-tegra/tegra210/Kconfig"
+source "arch/arm/mach-tegra/tegra186/Kconfig"
 
 endif