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 8615248..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"
@@ -17,31 +18,19 @@ config TEGRA124
 
 endchoice
 
-config SYS_MALLOC_F
-       default y
-
 config SYS_MALLOC_F_LEN
        default 0x1800
 
 config USE_PRIVATE_LIBGCC
        default y
 
-config DM
-       default y
-
-config DM_SERIAL
-       default y
-
-config DM_SPI
-       default y
-
-config DM_SPI_FLASH
+config DM_USB
        default y
 
-config DM_I2C
+config SPL_DM
        default y
 
-config DM_GPIO
+config SPL_DISABLE_OF_CONTROL
        default y
 
 source "arch/arm/mach-tegra/tegra20/Kconfig"