LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Masahiro Yamada 2015-03-16 16:43:24 +09:00 committed by Michal Simek
parent 9b9c6516b0
commit 5ca269a4df
12 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/Kconfig
View File

@ -644,7 +644,7 @@ config TARGET_COLIBRI_VF
bool "Support Colibri VF50/61" bool "Support Colibri VF50/61"
select CPU_V7 select CPU_V7
config ZYNQ config ARCH_ZYNQ
bool "Xilinx Zynq Platform" bool "Xilinx Zynq Platform"
select CPU_V7 select CPU_V7
select SUPPORT_SPL select SUPPORT_SPL

2
arch/arm/Makefile
View File

@ -55,7 +55,7 @@ machine-$(CONFIG_ORION5X) += orion5x
machine-$(CONFIG_TEGRA) += tegra machine-$(CONFIG_TEGRA) += tegra
machine-$(CONFIG_ARCH_UNIPHIER) += uniphier machine-$(CONFIG_ARCH_UNIPHIER) += uniphier
machine-$(CONFIG_ARCH_VERSATILE) += versatile machine-$(CONFIG_ARCH_VERSATILE) += versatile
machine-$(CONFIG_ZYNQ) += zynq machine-$(CONFIG_ARCH_ZYNQ) += zynq
machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))

2
arch/arm/dts/Makefile
View File

@ -39,7 +39,7 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \
uniphier-ph1-pro4-ref.dtb \ uniphier-ph1-pro4-ref.dtb \
uniphier-ph1-ld4-ref.dtb \ uniphier-ph1-ld4-ref.dtb \
uniphier-ph1-sld8-ref.dtb uniphier-ph1-sld8-ref.dtb
dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \ dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \
zynq-zc706.dtb \ zynq-zc706.dtb \
zynq-zed.dtb \ zynq-zed.dtb \
zynq-zybo.dtb \ zynq-zybo.dtb \

2
arch/arm/mach-zynq/Kconfig
View File

@ -1,4 +1,4 @@
if ZYNQ if ARCH_ZYNQ
choice choice
prompt "Xilinx Zynq board select" prompt "Xilinx Zynq board select"

2
configs/zynq_microzed_defconfig
View File

@ -1,6 +1,6 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ZYNQ=y CONFIG_ARCH_ZYNQ=y
CONFIG_TARGET_ZYNQ_MICROZED=y CONFIG_TARGET_ZYNQ_MICROZED=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
# CONFIG_SYS_MALLOC_F is not set # CONFIG_SYS_MALLOC_F is not set

2
configs/zynq_picozed_defconfig
View File

@ -1,6 +1,6 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ZYNQ=y CONFIG_ARCH_ZYNQ=y
CONFIG_TARGET_ZYNQ_PICOZED=y CONFIG_TARGET_ZYNQ_PICOZED=y
CONFIG_OF_CONTROL=n CONFIG_OF_CONTROL=n
CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed" CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed"

2
configs/zynq_zc70x_defconfig
View File

@ -1,6 +1,6 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ZYNQ=y CONFIG_ARCH_ZYNQ=y
CONFIG_TARGET_ZYNQ_ZC70X=y CONFIG_TARGET_ZYNQ_ZC70X=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702" CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"

2
configs/zynq_zc770_xm010_defconfig
View File

@ -1,7 +1,7 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010" CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ZYNQ=y CONFIG_ARCH_ZYNQ=y
CONFIG_TARGET_ZYNQ_ZC770=y CONFIG_TARGET_ZYNQ_ZC770=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010" CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010"

2
configs/zynq_zc770_xm012_defconfig
View File

@ -1,7 +1,7 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012" CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ZYNQ=y CONFIG_ARCH_ZYNQ=y
CONFIG_TARGET_ZYNQ_ZC770=y CONFIG_TARGET_ZYNQ_ZC770=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012" CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012"

2
configs/zynq_zc770_xm013_defconfig
View File

@ -1,7 +1,7 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013" CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ZYNQ=y CONFIG_ARCH_ZYNQ=y
CONFIG_TARGET_ZYNQ_ZC770=y CONFIG_TARGET_ZYNQ_ZC770=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013" CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013"

2
configs/zynq_zed_defconfig
View File

@ -1,6 +1,6 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ZYNQ=y CONFIG_ARCH_ZYNQ=y
CONFIG_TARGET_ZYNQ_ZED=y CONFIG_TARGET_ZYNQ_ZED=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zed" CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"

2
configs/zynq_zybo_defconfig
View File

@ -1,6 +1,6 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ZYNQ=y CONFIG_ARCH_ZYNQ=y
CONFIG_TARGET_ZYNQ_ZYBO=y CONFIG_TARGET_ZYNQ_ZYBO=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo" CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo"