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

[people/ms/u-boot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2145557587830f4a66381d764cf283164d5de548..7ed0e2052107cf2045251185fd204b02d7eabbfa 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -132,6 +132,11 @@ config TARGET_DEVKIT3250
        bool "Support devkit3250"
        select CPU_ARM926EJS
 
+config TARGET_WORK_92105
+       bool "Support work_92105"
+       select CPU_ARM926EJS
+       select SUPPORT_SPL
+
 config TARGET_MX25PDK
        bool "Support mx25pdk"
        select CPU_ARM926EJS
@@ -286,13 +291,8 @@ config TARGET_MX35PDK
        bool "Support mx35pdk"
        select CPU_ARM1136
 
-config TARGET_RPI
-       bool "Support rpi"
-       select CPU_ARM1176
-
-config TARGET_RPI_2
-       bool "Support rpi_2"
-       select CPU_V7
+config ARCH_BCM283X
+       bool "Broadcom BCM283X family"
 
 config TARGET_INTEGRATORAP_CM946ES
        bool "Support integratorap_cm946es"
@@ -437,6 +437,10 @@ config ARCH_MX6
        bool "Freescale MX6"
        select CPU_V7
 
+config ARCH_MX5
+       bool "Freescale MX5"
+       select CPU_V7
+
 config TARGET_M53EVK
        bool "Support m53evk"
        select CPU_V7
@@ -727,9 +731,9 @@ endchoice
 
 source "arch/arm/mach-at91/Kconfig"
 
-source "arch/arm/mach-davinci/Kconfig"
+source "arch/arm/mach-bcm283x/Kconfig"
 
-source "arch/arm/cpu/arm1176/bcm2835/Kconfig"
+source "arch/arm/mach-davinci/Kconfig"
 
 source "arch/arm/cpu/armv7/exynos/Kconfig"
 
@@ -741,6 +745,8 @@ source "arch/arm/mach-kirkwood/Kconfig"
 
 source "arch/arm/cpu/armv7/mx6/Kconfig"
 
+source "arch/arm/cpu/armv7/mx5/Kconfig"
+
 source "arch/arm/mach-nomadik/Kconfig"
 
 source "arch/arm/cpu/armv7/omap3/Kconfig"
@@ -767,6 +773,8 @@ source "arch/arm/cpu/armv7/Kconfig"
 
 source "arch/arm/cpu/armv8/Kconfig"
 
+source "arch/arm/imx-common/Kconfig"
+
 source "board/aristainetos/Kconfig"
 source "board/BuR/kwb/Kconfig"
 source "board/BuR/tseries/Kconfig"
@@ -840,8 +848,6 @@ source "board/palmtreo680/Kconfig"
 source "board/phytec/pcm051/Kconfig"
 source "board/ppcag/bg0900/Kconfig"
 source "board/pxa255_idp/Kconfig"
-source "board/raspberrypi/rpi/Kconfig"
-source "board/raspberrypi/rpi_2/Kconfig"
 source "board/samsung/smdk2410/Kconfig"
 source "board/sandisk/sansa_fuze_plus/Kconfig"
 source "board/scb9328/Kconfig"
@@ -877,6 +883,7 @@ source "board/vpac270/Kconfig"
 source "board/wandboard/Kconfig"
 source "board/warp/Kconfig"
 source "board/woodburn/Kconfig"
+source "board/work-microwave/work_92105/Kconfig"
 source "board/xaeniax/Kconfig"
 source "board/xilinx/zynqmp/Kconfig"
 source "board/zipitz2/Kconfig"