ARM: zynq: rename CONFIG_ZYNQ to CONFIG_ARCH_ZYNQ
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
parent
9b9c6516b0
commit
5ca269a4df
@ -644,7 +644,7 @@ config TARGET_COLIBRI_VF
|
||||
bool "Support Colibri VF50/61"
|
||||
select CPU_V7
|
||||
|
||||
config ZYNQ
|
||||
config ARCH_ZYNQ
|
||||
bool "Xilinx Zynq Platform"
|
||||
select CPU_V7
|
||||
select SUPPORT_SPL
|
||||
|
@ -55,7 +55,7 @@ machine-$(CONFIG_ORION5X) += orion5x
|
||||
machine-$(CONFIG_TEGRA) += tegra
|
||||
machine-$(CONFIG_ARCH_UNIPHIER) += uniphier
|
||||
machine-$(CONFIG_ARCH_VERSATILE) += versatile
|
||||
machine-$(CONFIG_ZYNQ) += zynq
|
||||
machine-$(CONFIG_ARCH_ZYNQ) += zynq
|
||||
|
||||
machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
|
||||
|
||||
|
@ -39,7 +39,7 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \
|
||||
uniphier-ph1-pro4-ref.dtb \
|
||||
uniphier-ph1-ld4-ref.dtb \
|
||||
uniphier-ph1-sld8-ref.dtb
|
||||
dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \
|
||||
dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \
|
||||
zynq-zc706.dtb \
|
||||
zynq-zed.dtb \
|
||||
zynq-zybo.dtb \
|
||||
|
@ -1,4 +1,4 @@
|
||||
if ZYNQ
|
||||
if ARCH_ZYNQ
|
||||
|
||||
choice
|
||||
prompt "Xilinx Zynq board select"
|
||||
|
@ -1,6 +1,6 @@
|
||||
CONFIG_SPL=y
|
||||
CONFIG_ARM=y
|
||||
CONFIG_ZYNQ=y
|
||||
CONFIG_ARCH_ZYNQ=y
|
||||
CONFIG_TARGET_ZYNQ_MICROZED=y
|
||||
CONFIG_OF_CONTROL=y
|
||||
# CONFIG_SYS_MALLOC_F is not set
|
||||
|
@ -1,6 +1,6 @@
|
||||
CONFIG_SPL=y
|
||||
CONFIG_ARM=y
|
||||
CONFIG_ZYNQ=y
|
||||
CONFIG_ARCH_ZYNQ=y
|
||||
CONFIG_TARGET_ZYNQ_PICOZED=y
|
||||
CONFIG_OF_CONTROL=n
|
||||
CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed"
|
||||
|
@ -1,6 +1,6 @@
|
||||
CONFIG_SPL=y
|
||||
CONFIG_ARM=y
|
||||
CONFIG_ZYNQ=y
|
||||
CONFIG_ARCH_ZYNQ=y
|
||||
CONFIG_TARGET_ZYNQ_ZC70X=y
|
||||
CONFIG_OF_CONTROL=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"
|
||||
|
@ -1,7 +1,7 @@
|
||||
CONFIG_SPL=y
|
||||
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
|
||||
CONFIG_ARM=y
|
||||
CONFIG_ZYNQ=y
|
||||
CONFIG_ARCH_ZYNQ=y
|
||||
CONFIG_TARGET_ZYNQ_ZC770=y
|
||||
CONFIG_OF_CONTROL=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010"
|
||||
|
@ -1,7 +1,7 @@
|
||||
CONFIG_SPL=y
|
||||
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
|
||||
CONFIG_ARM=y
|
||||
CONFIG_ZYNQ=y
|
||||
CONFIG_ARCH_ZYNQ=y
|
||||
CONFIG_TARGET_ZYNQ_ZC770=y
|
||||
CONFIG_OF_CONTROL=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012"
|
||||
|
@ -1,7 +1,7 @@
|
||||
CONFIG_SPL=y
|
||||
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
|
||||
CONFIG_ARM=y
|
||||
CONFIG_ZYNQ=y
|
||||
CONFIG_ARCH_ZYNQ=y
|
||||
CONFIG_TARGET_ZYNQ_ZC770=y
|
||||
CONFIG_OF_CONTROL=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013"
|
||||
|
@ -1,6 +1,6 @@
|
||||
CONFIG_SPL=y
|
||||
CONFIG_ARM=y
|
||||
CONFIG_ZYNQ=y
|
||||
CONFIG_ARCH_ZYNQ=y
|
||||
CONFIG_TARGET_ZYNQ_ZED=y
|
||||
CONFIG_OF_CONTROL=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
|
||||
|
@ -1,6 +1,6 @@
|
||||
CONFIG_SPL=y
|
||||
CONFIG_ARM=y
|
||||
CONFIG_ZYNQ=y
|
||||
CONFIG_ARCH_ZYNQ=y
|
||||
CONFIG_TARGET_ZYNQ_ZYBO=y
|
||||
CONFIG_OF_CONTROL=y
|
||||
CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo"
|
||||
|
Loading…
Reference in New Issue
Block a user