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

[platform/kernel/u-boot.git] / arch / arm / cpu / armv7 / exynos / Kconfig

diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig
index 2064efa..3ca7128 100644 (file)
--- a/arch/arm/cpu/armv7/exynos/Kconfig
+++ b/arch/arm/cpu/armv7/exynos/Kconfig
@@ -2,11 +2,13 @@ if ARCH_EXYNOS
 
 choice
        prompt "EXYNOS board select"
+       optional
 
 config TARGET_SMDKV310
        select SUPPORT_SPL
        bool "Exynos4210 SMDKV310 board"
-       select OF_CONTROL if !SPL_BUILD
+       select OF_CONTROL
+       select SPL_DISABLE_OF_CONTROL
 
 config TARGET_TRATS
        bool "Exynos4210 Trats board"
@@ -27,64 +29,53 @@ config TARGET_ODROID
 config TARGET_ODROID_XU3
        bool "Exynos5422 Odroid board"
        select OF_CONTROL
+       select SPL_DISABLE_OF_CONTROL
 
 config TARGET_ARNDALE
        bool "Exynos5250 Arndale board"
        select CPU_V7_HAS_NONSEC
        select CPU_V7_HAS_VIRT
        select SUPPORT_SPL
-       select OF_CONTROL if !SPL_BUILD
+       select OF_CONTROL
+       select SPL_DISABLE_OF_CONTROL
 
 config TARGET_SMDK5250
        bool "SMDK5250 board"
        select SUPPORT_SPL
-       select OF_CONTROL if !SPL_BUILD
+       select OF_CONTROL
+       select SPL_DISABLE_OF_CONTROL
 
 config TARGET_SNOW
        bool "Snow board"
        select SUPPORT_SPL
-       select OF_CONTROL if !SPL_BUILD
+       select OF_CONTROL
+       select SPL_DISABLE_OF_CONTROL
 
 config TARGET_SMDK5420
        bool "SMDK5420 board"
        select SUPPORT_SPL
-       select OF_CONTROL if !SPL_BUILD
+       select OF_CONTROL
+       select SPL_DISABLE_OF_CONTROL
 
 config TARGET_PEACH_PI
        bool "Peach Pi board"
        select SUPPORT_SPL
-       select OF_CONTROL if !SPL_BUILD
+       select OF_CONTROL
+       select SPL_DISABLE_OF_CONTROL
 
 config TARGET_PEACH_PIT
        bool "Peach Pit board"
        select SUPPORT_SPL
-       select OF_CONTROL if !SPL_BUILD
+       select OF_CONTROL
+       select SPL_DISABLE_OF_CONTROL
 
 endchoice
 
 config SYS_SOC
        default "exynos"
 
-config DM
-       default y if !SPL_BUILD
-
-config DM_SERIAL
-       default y if !SPL_BUILD
-
-config DM_SPI
-       default y if !SPL_BUILD
-
-config DM_SPI_FLASH
-       default y if !SPL_BUILD
-
-config DM_GPIO
-       default y if !SPL_BUILD
-
-config SYS_MALLOC_F
-       default y if !SPL_BUILD
-
-config SYS_MALLOC_F_LEN
-       default 0x400 if !SPL_BUILD
+config DM_USB
+       default y
 
 source "board/samsung/smdkv310/Kconfig"
 source "board/samsung/trats/Kconfig"