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

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

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 8bab594..f5b5ee9 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -2,6 +2,7 @@ if TEGRA
 
 choice
        prompt "Tegra SoC select"
+       optional
 
 config TEGRA20
        bool "Tegra20 family"
@@ -23,9 +24,15 @@ config SYS_MALLOC_F_LEN
 config USE_PRIVATE_LIBGCC
        default y
 
+config DM_USB
+       default y
+
 config SPL_DM
        default y
 
+config SPL_DISABLE_OF_CONTROL
+       default y
+
 source "arch/arm/mach-tegra/tegra20/Kconfig"
 source "arch/arm/mach-tegra/tegra30/Kconfig"
 source "arch/arm/mach-tegra/tegra114/Kconfig"