Merge branch 'rmobile' of git://git.denx.de/u-boot-sh

[oweals/u-boot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4065001d76e29fc3098cabe9e76e6277ba85ce2d..c4371c71733e2c29cf44ce3d39b1cfbe12d95ae0 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -134,11 +134,6 @@ config TARGET_MX25PDK
        bool "Support mx25pdk"
        select CPU_ARM926EJS
 
-config TARGET_TX25
-       bool "Support tx25"
-       select CPU_ARM926EJS
-       select SUPPORT_SPL
-
 config TARGET_ZMX25
        bool "Support zmx25"
        select CPU_ARM926EJS
@@ -368,6 +363,13 @@ config TARGET_AM335X_EVM
        select DM_SERIAL
        select DM_GPIO
 
+config TARGET_AM335X_SL50
+       bool "Support am335x_sl50"
+       select CPU_V7
+       select SUPPORT_SPL
+       select DM
+       select DM_SERIAL
+
 config TARGET_AM43XX_EVM
        bool "Support am43xx_evm"
        select CPU_V7
@@ -440,6 +442,10 @@ config ARCH_KEYSTONE
        select CPU_V7
        select SUPPORT_SPL
 
+config ARCH_MX7
+       bool "Freescale MX7"
+       select CPU_V7
+
 config ARCH_MX6
        bool "Freescale MX6"
        select CPU_V7
@@ -614,15 +620,6 @@ config TARGET_H2200
        bool "Support h2200"
        select CPU_PXA
 
-config TARGET_PALMTREO680
-       bool "Support palmtreo680"
-       select CPU_PXA
-       select SUPPORT_SPL
-
-config TARGET_XAENIAX
-       bool "Support xaeniax"
-       select CPU_PXA
-
 config TARGET_COLIBRI_PXA270
        bool "Support colibri_pxa270"
        select CPU_PXA
@@ -672,6 +669,8 @@ source "arch/arm/mach-keystone/Kconfig"
 
 source "arch/arm/mach-kirkwood/Kconfig"
 
+source "arch/arm/cpu/armv7/mx7/Kconfig"
+
 source "arch/arm/cpu/armv7/mx6/Kconfig"
 
 source "arch/arm/cpu/armv7/mx5/Kconfig"
@@ -748,11 +747,9 @@ source "board/h2200/Kconfig"
 source "board/hisilicon/hikey/Kconfig"
 source "board/imx31_phycore/Kconfig"
 source "board/isee/igep0033/Kconfig"
-source "board/karo/tx25/Kconfig"
 source "board/maxbcm/Kconfig"
 source "board/mpl/vcma9/Kconfig"
 source "board/olimex/mx23_olinuxino/Kconfig"
-source "board/palmtreo680/Kconfig"
 source "board/phytec/pcm051/Kconfig"
 source "board/ppcag/bg0900/Kconfig"
 source "board/samsung/smdk2410/Kconfig"
@@ -771,6 +768,7 @@ source "board/st/stm32f429-discovery/Kconfig"
 source "board/st/stv0991/Kconfig"
 source "board/sunxi/Kconfig"
 source "board/syteco/zmx25/Kconfig"
+source "board/tcl/sl50/Kconfig"
 source "board/ti/am335x/Kconfig"
 source "board/ti/am43xx/Kconfig"
 source "board/birdland/bav335x/Kconfig"
@@ -783,7 +781,6 @@ source "board/technologic/ts4800/Kconfig"
 source "board/vscom/baltos/Kconfig"
 source "board/woodburn/Kconfig"
 source "board/work-microwave/work_92105/Kconfig"
-source "board/xaeniax/Kconfig"
 
 source "arch/arm/Kconfig.debug"