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

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d6b0cea63fed34137fe0b9c140ea4cf50ad894a5..b758745f4a6962f7f3c12c9c32b5857ad30a4e02 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -600,6 +600,11 @@ config ARCH_MESON
          targeted at media players and tablet computers. We currently
          support the S905 (GXBaby) 64-bit SoC.
 
+config ARCH_MX7ULP
+        bool "NXP MX7ULP"
+        select CPU_V7
+       select ROM_UNIFIED_SECTIONS
+
 config ARCH_MX7
        bool "Freescale MX7"
        select CPU_V7
@@ -810,31 +815,11 @@ config TARGET_TS4800
        select CPU_V7
        select SYS_FSL_ERRATUM_ESDHC_A001
 
-config TARGET_VF610TWR
-       bool "Support vf610twr"
-       select CPU_V7
-       select SYS_FSL_ERRATUM_ESDHC111
-
-config TARGET_COLIBRI_VF
-       bool "Support Colibri VF50/61"
-       select BOARD_LATE_INIT
+config ARCH_VF610
+       bool "Freescale Vybrid"
        select CPU_V7
        select SYS_FSL_ERRATUM_ESDHC111
 
-config TARGET_PCM052
-       bool "Support pcm-052"
-       select CPU_V7
-       select SYS_FSL_ERRATUM_ESDHC111
-       select SYS_FSL_ERRATUM_ESDHC135
-       select SYS_FSL_ERRATUM_ESDHC_A001
-
-config TARGET_BK4R1
-       bool "Support BK4r1"
-       select CPU_V7
-       select SYS_FSL_ERRATUM_ESDHC111
-       select SYS_FSL_ERRATUM_ESDHC135
-       select SYS_FSL_ERRATUM_ESDHC_A001
-
 config ARCH_ZYNQ
        bool "Xilinx Zynq Platform"
        select BOARD_LATE_INIT
@@ -1192,6 +1177,8 @@ source "arch/arm/mach-mvebu/Kconfig"
 
 source "arch/arm/cpu/armv7/ls102xa/Kconfig"
 
+source "arch/arm/cpu/armv7/mx7ulp/Kconfig"
+
 source "arch/arm/cpu/armv7/mx7/Kconfig"
 
 source "arch/arm/cpu/armv7/mx6/Kconfig"
@@ -1224,6 +1211,8 @@ source "arch/arm/mach-tegra/Kconfig"
 
 source "arch/arm/mach-uniphier/Kconfig"
 
+source "arch/arm/cpu/armv7/vf610/Kconfig"
+
 source "arch/arm/mach-zynq/Kconfig"
 
 source "arch/arm/cpu/armv7/Kconfig"
@@ -1280,7 +1269,6 @@ source "board/freescale/mx53evk/Kconfig"
 source "board/freescale/mx53loco/Kconfig"
 source "board/freescale/mx53smd/Kconfig"
 source "board/freescale/s32v234evb/Kconfig"
-source "board/freescale/vf610twr/Kconfig"
 source "board/grinn/chiliboard/Kconfig"
 source "board/gumstix/pepper/Kconfig"
 source "board/h2200/Kconfig"
@@ -1289,7 +1277,6 @@ source "board/imx31_phycore/Kconfig"
 source "board/isee/igep0033/Kconfig"
 source "board/olimex/mx23_olinuxino/Kconfig"
 source "board/phytec/pcm051/Kconfig"
-source "board/phytec/pcm052/Kconfig"
 source "board/ppcag/bg0900/Kconfig"
 source "board/sandisk/sansa_fuze_plus/Kconfig"
 source "board/schulercontrol/sc_sps_1/Kconfig"
@@ -1313,7 +1300,6 @@ source "board/ti/ti814x/Kconfig"
 source "board/ti/ti816x/Kconfig"
 source "board/timll/devkit3250/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
-source "board/toradex/colibri_vf/Kconfig"
 source "board/technologic/ts4600/Kconfig"
 source "board/technologic/ts4800/Kconfig"
 source "board/vscom/baltos/Kconfig"