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

[karo-tx-uboot.git] / arch / arm / cpu / armv7 / exynos / Kconfig

diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig
index f1cacdce2951973bb420a577049ca998ce2be472..f3eadb4db30b762670521ac8a8ad2e733a80346a 100644 (file)
--- a/arch/arm/cpu/armv7/exynos/Kconfig
+++ b/arch/arm/cpu/armv7/exynos/Kconfig
@@ -4,7 +4,9 @@ choice
        prompt "EXYNOS board select"
 
 config TARGET_SMDKV310
+       select SUPPORT_SPL
        bool "Exynos4210 SMDKV310 board"
+       select OF_CONTROL if !SPL_BUILD
 
 config TARGET_TRATS
        bool "Exynos4210 Trats board"
@@ -14,33 +16,49 @@ config TARGET_S5PC210_UNIVERSAL
 
 config TARGET_ORIGEN
        bool "Exynos4412 Origen board"
+       select SUPPORT_SPL
 
 config TARGET_TRATS2
        bool "Exynos4412 Trat2 board"
 
+config TARGET_ODROID
+       bool "Exynos4412 Odroid board"
+
 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
 
 config TARGET_SMDK5250
        bool "SMDK5250 board"
+       select SUPPORT_SPL
+       select OF_CONTROL if !SPL_BUILD
 
 config TARGET_SNOW
        bool "Snow board"
+       select SUPPORT_SPL
+       select OF_CONTROL if !SPL_BUILD
 
 config TARGET_SMDK5420
        bool "SMDK5420 board"
+       select SUPPORT_SPL
+       select OF_CONTROL if !SPL_BUILD
 
-config TARGET_PEACH_PIT
+config TARGET_PEACH_PI
        bool "Peach Pi board"
+       select SUPPORT_SPL
+       select OF_CONTROL if !SPL_BUILD
 
-endchoice
+config TARGET_PEACH_PIT
+       bool "Peach Pit board"
+       select SUPPORT_SPL
+       select OF_CONTROL if !SPL_BUILD
 
-config SYS_CPU
-       string
-       default "armv7"
+endchoice
 
 config SYS_SOC
-       string
        default "exynos"
 
 source "board/samsung/smdkv310/Kconfig"
@@ -48,6 +66,7 @@ source "board/samsung/trats/Kconfig"
 source "board/samsung/universal_c210/Kconfig"
 source "board/samsung/origen/Kconfig"
 source "board/samsung/trats2/Kconfig"
+source "board/samsung/odroid/Kconfig"
 source "board/samsung/arndale/Kconfig"
 source "board/samsung/smdk5250/Kconfig"
 source "board/samsung/smdk5420/Kconfig"