summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-08-31 07:10:55 +0900
committerTom Rini <trini@ti.com>2014-08-30 21:19:32 -0400
commit44dcb4036b793acc7b5b384f5b572b4fe6e6be76 (patch)
treec64380d2c2c2d3867c99a4c29037a683f3b3df86 /arch/arm/Kconfig
parenteeadd3fe0f3efaf020994a27d4394b02a6270e39 (diff)
downloadblackbird-obmc-uboot-44dcb4036b793acc7b5b384f5b572b4fe6e6be76.tar.gz
blackbird-obmc-uboot-44dcb4036b793acc7b5b384f5b572b4fe6e6be76.zip
zynq: kconfig: move board select menu and common settings
Becuase the board select menu in arch/arm/Kconfig is too big, move the Zynq board select menu to zynq/Kconfig. Consolidate also common settings (CONFIG_SYS_CPU="armv7" and CONFIG_SYS_SOC="zynq"). Refactor board/xilinx/zynq/MAINTAINERS too. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Tested-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig15
1 files changed, 3 insertions, 12 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 71757e783c..cac9143f21 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -668,17 +668,8 @@ config TARGET_U8500_HREF
config TARGET_VF610TWR
bool "Support vf610twr"
-config TARGET_ZYNQ_MICROZED
- bool "Support zynq_microzed"
-
-config TARGET_ZYNQ_ZC70X
- bool "Support zynq_zc70x"
-
-config TARGET_ZYNQ_ZC770
- bool "Support zynq_zc770"
-
-config TARGET_ZYNQ_ZED
- bool "Support zynq_zed"
+config ZYNQ
+ bool "Xilinx Zynq Platform"
config TARGET_MEDCOM_WIDE
bool "Support medcom-wide"
@@ -784,6 +775,7 @@ config TARGET_JORNADA
endchoice
+source "arch/arm/cpu/armv7/zynq/Kconfig"
source "board/8dtech/eco5pk/Kconfig"
source "board/aristainetos/Kconfig"
source "board/Barix/ipam390/Kconfig"
@@ -1012,7 +1004,6 @@ source "board/vpac270/Kconfig"
source "board/wandboard/Kconfig"
source "board/woodburn/Kconfig"
source "board/xaeniax/Kconfig"
-source "board/xilinx/zynq/Kconfig"
source "board/zipitz2/Kconfig"
endmenu
OpenPOWER on IntegriCloud