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

[u-boot] / arch / arm / mach-davinci / Kconfig

diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index 68277217bfc61eec7f464995b0ef42b84f851407..c593dadf682743519b14d2da65b0743a1ae5231a 100644 (file)
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -2,73 +2,54 @@ if ARCH_DAVINCI
 
 choice
        prompt "DaVinci board select"
-
-config TARGET_ENBW_CMC
-       bool "EnBW CMC board"
+       optional
 
 config TARGET_IPAM390
        bool "IPAM390 board"
        select SUPPORT_SPL
-
-config TARGET_DA830EVM
-       bool "DA830 EVM board"
+       select SYS_DA850_PLL_INIT
+       select SYS_DA850_DDR_INIT
 
 config TARGET_DA850EVM
        bool "DA850 EVM board"
        select SUPPORT_SPL
-
-config TARGET_CAM_ENC_4XX
-       bool "CAM ENC 4xx board"
-       select SUPPORT_SPL
-
-config TARGET_DAVINCI_DM355EVM
-       bool "DM355 EVM board"
-
-config TARGET_DAVINCI_DM355LEOPARD
-       bool "DM355 Leopard board"
-
-config TARGET_DAVINCI_DM365EVM
-       bool "DM365 EVM board"
-
-config TARGET_DAVINCI_DM6467EVM
-       bool "DM6467 EVM board"
-
-config TARGET_DAVINCI_DVEVM
-       bool "DVEVM board"
+       select SYS_DA850_PLL_INIT
+       select SYS_DA850_DDR_INIT
 
 config TARGET_EA20
        bool "EA20 board"
 
-config TARGET_DAVINCI_SCHMOOGIE
-       bool "Schmoogie board"
-
-config TARGET_DAVINCI_SFFSDR
-       bool "SFFSDR board"
-
-config TARGET_DAVINCI_SONATA
-       bool "Sonata board"
+config TARGET_OMAPL138_LCDK
+       bool "OMAPL138 LCDK"
+       select SUPPORT_SPL
+       select SYS_DA850_PLL_INIT
+       select SYS_DA850_DDR_INIT
 
 config TARGET_CALIMAIN
        bool "Calimain board"
+       select SYS_DA850_PLL_INIT
+       select SYS_DA850_DDR_INIT
+
+config TARGET_LEGOEV3
+       bool "LEGO MINDSTORMS EV3"
+       select SYS_DA850_PLL_INIT
+       select SYS_DA850_DDR_INIT
 
 endchoice
 
 config SYS_SOC
        default "davinci"
 
-source "board/enbw/enbw_cmc/Kconfig"
-source "board/ait/cam_enc_4xx/Kconfig"
+config SYS_DA850_PLL_INIT
+       bool
+
+config SYS_DA850_DDR_INIT
+       bool
+
 source "board/Barix/ipam390/Kconfig"
 source "board/davinci/da8xxevm/Kconfig"
-source "board/davinci/dm355evm/Kconfig"
-source "board/davinci/dm355leopard/Kconfig"
-source "board/davinci/dm365evm/Kconfig"
-source "board/davinci/dm6467evm/Kconfig"
-source "board/davinci/dvevm/Kconfig"
 source "board/davinci/ea20/Kconfig"
-source "board/davinci/schmoogie/Kconfig"
-source "board/davinci/sffsdr/Kconfig"
-source "board/davinci/sonata/Kconfig"
 source "board/omicron/calimain/Kconfig"
+source "board/lego/ev3/Kconfig"
 
 endif