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

[oweals/u-boot.git] / arch / arm / mach-tegra / Kconfig

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 3540edab9adbe06b25643cc88700525c8254d587..5bdbc700a4b368d8e2a216601f5c742ea686ef74 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -1,20 +1,48 @@
 if TEGRA
 
+config SPL_GPIO_SUPPORT
+       default y
+
+config SPL_LIBCOMMON_SUPPORT
+       default y
+
+config SPL_LIBGENERIC_SUPPORT
+       default y
+
+config SPL_SERIAL_SUPPORT
+       default y
+
+config TEGRA_IVC
+       bool "Tegra IVC protocol"
+       help
+         IVC (Inter-VM Communication) protocol is a Tegra-specific IPC
+         (Inter Processor Communication) framework. Within the context of
+         U-Boot, it is typically used for communication between the main CPU
+         and various auxiliary processors.
+
 config TEGRA_COMMON
        bool "Tegra common options"
+       select CLK
        select DM
        select DM_ETH
        select DM_GPIO
        select DM_I2C
        select DM_KEYBOARD
-       select DM_PCI
-       select DM_PCI_COMPAT
+       select DM_MMC
        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
+       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"
@@ -22,6 +50,8 @@ config TEGRA_ARMV7_COMMON
        select SPL
        select SUPPORT_SPL
        select TEGRA_COMMON
+       select TEGRA_GPIO
+       select TEGRA_NO_BPMP
 
 config TEGRA_ARMV8_COMMON
        bool "Tegra 64-bit common options"
@@ -50,7 +80,20 @@ config TEGRA124
 
 config TEGRA210
        bool "Tegra210 family"
+       select TEGRA_GPIO
+       select TEGRA_ARMV8_COMMON
+       select TEGRA_NO_BPMP
+
+config TEGRA186
+       bool "Tegra186 family"
+       select DM_MAILBOX
+       select TEGRA186_BPMP
+       select TEGRA186_CLOCK
+       select TEGRA186_GPIO
+       select TEGRA186_RESET
        select TEGRA_ARMV8_COMMON
+       select TEGRA_HSP
+       select TEGRA_IVC
 
 endchoice
 
@@ -75,5 +118,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