Commit 44dcb403 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Tom Rini

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: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
Tested-by: default avatarMichal Simek <michal.simek@xilinx.com>
parent eeadd3fe
......@@ -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
if ZYNQ
choice
prompt "Xilinx Zynq board select"
config TARGET_ZYNQ_ZED
bool "Zynq ZedBoard"
config TARGET_ZYNQ_MICROZED
bool "Zynq MicroZed"
config TARGET_ZYNQ_ZC70X
bool "Zynq ZC702/ZC706 Board"
config TARGET_ZYNQ_ZC770
bool "Zynq ZC770 Board"
endchoice
config SYS_CPU
string
default "armv7"
config SYS_BOARD
string
default "zynq"
config SYS_VENDOR
string
default "xilinx"
config SYS_SOC
string
default "zynq"
config SYS_CONFIG_NAME
string
default "zynq_zed" if TARGET_ZYNQ_ZED
default "zynq_microzed" if TARGET_ZYNQ_MICROZED
default "zynq_zc70x" if TARGET_ZYNQ_ZC70X
default "zynq_zc770" if TARGET_ZYNQ_ZC770
endif
if TARGET_ZYNQ_MICROZED
config SYS_CPU
string
default "armv7"
config SYS_BOARD
string
default "zynq"
config SYS_VENDOR
string
default "xilinx"
config SYS_SOC
string
default "zynq"
config SYS_CONFIG_NAME
string
default "zynq_microzed"
endif
if TARGET_ZYNQ_ZC70X
config SYS_CPU
string
default "armv7"
config SYS_BOARD
string
default "zynq"
config SYS_VENDOR
string
default "xilinx"
config SYS_SOC
string
default "zynq"
config SYS_CONFIG_NAME
string
default "zynq_zc70x"
endif
if TARGET_ZYNQ_ZC770
config SYS_CPU
string
default "armv7"
config SYS_BOARD
string
default "zynq"
config SYS_VENDOR
string
default "xilinx"
config SYS_SOC
string
default "zynq"
config SYS_CONFIG_NAME
string
default "zynq_zc770"
endif
if TARGET_ZYNQ_ZED
config SYS_CPU
string
default "armv7"
config SYS_BOARD
string
default "zynq"
config SYS_VENDOR
string
default "xilinx"
config SYS_SOC
string
default "zynq"
config SYS_CONFIG_NAME
string
default "zynq_zed"
endif
......@@ -3,13 +3,5 @@ M: Michal Simek <monstr@monstr.eu>
M: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
S: Maintained
F: board/xilinx/zynq/
F: include/configs/zynq_microzed.h
F: configs/zynq_microzed_defconfig
F: include/configs/zynq_zc70x.h
F: configs/zynq_zc70x_defconfig
F: include/configs/zynq_zc770.h
F: configs/zynq_zc770_xm010_defconfig
F: configs/zynq_zc770_xm012_defconfig
F: configs/zynq_zc770_xm013_defconfig
F: include/configs/zynq_zed.h
F: configs/zynq_zed_defconfig
F: include/configs/zynq*.h
F: configs/zynq_*_defconfig
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_MICROZED=y
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZC70X=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
+S:CONFIG_ARM=y
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZC770=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
+S:CONFIG_ARM=y
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZC770=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
+S:CONFIG_ARM=y
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZC770=y
CONFIG_SPL=y
+S:CONFIG_ARM=y
+S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZED=y
......@@ -12,7 +12,6 @@
/* High Level configuration Options */
#define CONFIG_ARMV7
#define CONFIG_ZYNQ
/* CPU clock */
#ifndef CONFIG_CPU_FREQ_HZ
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment