ARM: zynq: Simplify zynq configuration
Extending Kconfig for adding new platform is a lot of work for nothing. Setting SYS_CONFIG_NAME directly in Kconfig and remove all dependencies on TARGET_ZYNQ_* options including SPL. As a side-effect it also remove custom init folder for ps7_init_gpl.* files. Folder is chosen based on device-tree file. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek
parent
1b008fdb06
commit
ad5b580126
@ -1,41 +1,5 @@
|
||||
if ARCH_ZYNQ
|
||||
|
||||
config ZYNQ_CUSTOM_INIT
|
||||
bool "Use custom ps7_init provided by Xilinx tool"
|
||||
help
|
||||
U-Boot includes ps7_init_gpl.[ch] for some Zynq board variants.
|
||||
If you want to override them with customized ones
|
||||
or ps7_init code for your board is missing, please say Y here
|
||||
and add ones into board/xilinx/zynq/custom_hw_platform/ directory.
|
||||
|
||||
choice
|
||||
prompt "Xilinx Zynq board select"
|
||||
default TARGET_ZYNQ_ZC702
|
||||
|
||||
config TARGET_ZYNQ_ZED
|
||||
bool "Zynq ZedBoard"
|
||||
|
||||
config TARGET_ZYNQ_MICROZED
|
||||
bool "Zynq MicroZed"
|
||||
|
||||
config TARGET_ZYNQ_PICOZED
|
||||
bool "Zynq PicoZed"
|
||||
|
||||
config TARGET_ZYNQ_ZC702
|
||||
bool "Zynq ZC702 Board"
|
||||
|
||||
config TARGET_ZYNQ_ZC706
|
||||
bool "Zynq ZC706 Board"
|
||||
|
||||
config TARGET_ZYNQ_ZC770
|
||||
bool "Zynq ZC770 Board"
|
||||
select ZYNQ_CUSTOM_INIT
|
||||
|
||||
config TARGET_ZYNQ_ZYBO
|
||||
bool "Zynq Zybo Board"
|
||||
|
||||
endchoice
|
||||
|
||||
config SYS_BOARD
|
||||
default "zynq"
|
||||
|
||||
@ -46,11 +10,11 @@ config SYS_SOC
|
||||
default "zynq"
|
||||
|
||||
config SYS_CONFIG_NAME
|
||||
default "zynq_zed" if TARGET_ZYNQ_ZED
|
||||
default "zynq_microzed" if TARGET_ZYNQ_MICROZED
|
||||
default "zynq_picozed" if TARGET_ZYNQ_PICOZED
|
||||
default "zynq_zc70x" if TARGET_ZYNQ_ZC702 || TARGET_ZYNQ_ZC706
|
||||
default "zynq_zc770" if TARGET_ZYNQ_ZC770
|
||||
default "zynq_zybo" if TARGET_ZYNQ_ZYBO
|
||||
string "Board configuration name"
|
||||
default "zynq-common"
|
||||
help
|
||||
This option contains information about board configuration name.
|
||||
Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header
|
||||
will be used for board configuration.
|
||||
|
||||
endif
|
||||
|
||||
@ -7,17 +7,7 @@
|
||||
|
||||
obj-y := board.o
|
||||
|
||||
# Copied from Xilinx SDK 2014.4
|
||||
hw-platform-$(CONFIG_TARGET_ZYNQ_ZED) := zed_hw_platform
|
||||
hw-platform-$(CONFIG_TARGET_ZYNQ_MICROZED) := MicroZed_hw_platform
|
||||
hw-platform-$(CONFIG_TARGET_ZYNQ_ZC702) := ZC702_hw_platform
|
||||
hw-platform-$(CONFIG_TARGET_ZYNQ_ZC706) := ZC706_hw_platform
|
||||
hw-platform-$(CONFIG_TARGET_ZYNQ_ZYBO) := zybo_hw_platform
|
||||
# If you want to use customized ps7_init_gpl.c/h,
|
||||
# enable CONFIG_ZYNQ_CUSTOM_INIT and put them into custom_hw_platform/.
|
||||
# This line must be placed at the bottom of the list because
|
||||
# it takes precedence over the default ones.
|
||||
hw-platform-$(CONFIG_ZYNQ_CUSTOM_INIT) := custom_hw_platform
|
||||
hw-platform-y :=$(shell echo $(CONFIG_DEFAULT_DEVICE_TREE))
|
||||
|
||||
init-objs := $(if $(wildcard $(srctree)/$(src)/$(hw-platform-y)/ps7_init_gpl.c),\
|
||||
$(hw-platform-y)/ps7_init_gpl.o)
|
||||
|
||||
@ -1 +0,0 @@
|
||||
ps7_init_gpl.[ch]
|
||||
@ -1,6 +1,6 @@
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_CONFIG_NAME="zynq_microzed"
|
||||
CONFIG_ARCH_ZYNQ=y
|
||||
CONFIG_TARGET_ZYNQ_MICROZED=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="zynq-microzed"
|
||||
CONFIG_SPL=y
|
||||
CONFIG_FIT=y
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_CONFIG_NAME="zynq_picozed"
|
||||
CONFIG_ARCH_ZYNQ=y
|
||||
CONFIG_TARGET_ZYNQ_PICOZED=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed"
|
||||
CONFIG_SPL=y
|
||||
CONFIG_HUSH_PARSER=y
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_CONFIG_NAME="zynq_zc70x"
|
||||
CONFIG_ARCH_ZYNQ=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"
|
||||
CONFIG_SPL=y
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_CONFIG_NAME="zynq_zc70x"
|
||||
CONFIG_ARCH_ZYNQ=y
|
||||
CONFIG_TARGET_ZYNQ_ZC706=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc706"
|
||||
CONFIG_SPL=y
|
||||
CONFIG_FIT=y
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_CONFIG_NAME="zynq_zc770"
|
||||
CONFIG_ARCH_ZYNQ=y
|
||||
CONFIG_TARGET_ZYNQ_ZC770=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010"
|
||||
CONFIG_SPL=y
|
||||
CONFIG_FIT=y
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_CONFIG_NAME="zynq_zc770"
|
||||
CONFIG_ARCH_ZYNQ=y
|
||||
CONFIG_TARGET_ZYNQ_ZC770=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm011"
|
||||
CONFIG_SPL=y
|
||||
CONFIG_FIT=y
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_CONFIG_NAME="zynq_zc770"
|
||||
CONFIG_ARCH_ZYNQ=y
|
||||
CONFIG_TARGET_ZYNQ_ZC770=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012"
|
||||
CONFIG_SPL=y
|
||||
CONFIG_FIT=y
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_CONFIG_NAME="zynq_zc770"
|
||||
CONFIG_ARCH_ZYNQ=y
|
||||
CONFIG_TARGET_ZYNQ_ZC770=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013"
|
||||
CONFIG_SPL=y
|
||||
CONFIG_FIT=y
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_CONFIG_NAME="zynq_zed"
|
||||
CONFIG_ARCH_ZYNQ=y
|
||||
CONFIG_TARGET_ZYNQ_ZED=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
|
||||
CONFIG_SPL=y
|
||||
CONFIG_FIT=y
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_CONFIG_NAME="zynq_zybo"
|
||||
CONFIG_ARCH_ZYNQ=y
|
||||
CONFIG_TARGET_ZYNQ_ZYBO=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo"
|
||||
CONFIG_SPL=y
|
||||
CONFIG_FIT=y
|
||||
|
||||
Loading…
Reference in New Issue
Block a user