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

ARM: zynq: Remove zc70x target 

Remove zc70x target which was one setting for zc702 and zc706.
Currently zc702 and zc706 are separated.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Michal Simek 2015-10-30 15:05:54 +01:00
parent 42800ffa79
commit 1e370ef7e7
3 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,13 +21,6 @@ config TARGET_ZYNQ_MICROZED
config TARGET_ZYNQ_PICOZED config TARGET_ZYNQ_PICOZED
bool "Zynq PicoZed" bool "Zynq PicoZed"
config TARGET_ZYNQ_ZC70X
bool "Zynq ZC702/ZC706 Board (deprecated)"
select ZYNQ_CUSTOM_INIT
help
This option is deprecated. Use TARGET_ZYNQ_ZC702
or TARGET_ZYNQ_706.
config TARGET_ZYNQ_ZC702 config TARGET_ZYNQ_ZC702
bool "Zynq ZC702 Board" bool "Zynq ZC702 Board"
@ -57,8 +50,7 @@ config SYS_CONFIG_NAME
default "zynq_zed" if TARGET_ZYNQ_ZED default "zynq_zed" if TARGET_ZYNQ_ZED
default "zynq_microzed" if TARGET_ZYNQ_MICROZED default "zynq_microzed" if TARGET_ZYNQ_MICROZED
default "zynq_picozed" if TARGET_ZYNQ_PICOZED default "zynq_picozed" if TARGET_ZYNQ_PICOZED
default "zynq_zc70x" if TARGET_ZYNQ_ZC702 || TARGET_ZYNQ_ZC706 \ default "zynq_zc70x" if TARGET_ZYNQ_ZC702 || TARGET_ZYNQ_ZC706
|| TARGET_ZYNQ_ZC70X
default "zynq_zc770" if TARGET_ZYNQ_ZC770 default "zynq_zc770" if TARGET_ZYNQ_ZC770
default "zynq_zybo" if TARGET_ZYNQ_ZYBO default "zynq_zybo" if TARGET_ZYNQ_ZYBO

10
board/xilinx/zynq/Makefile
View File

@ -36,13 +36,3 @@ CFLAGS_REMOVE_ps7_init_gpl.o := -Wstrict-prototypes
# To include xil_io.h # To include xil_io.h
CFLAGS_ps7_init_gpl.o := -I$(srctree)/$(src) CFLAGS_ps7_init_gpl.o := -I$(srctree)/$(src)
# Warn if CONFIG_TARGET_ZYNQ_ZC70X is enabled
ifeq ($(CONFIG_TARGET_ZYNQ_ZC70X),y)
ifeq ($(CONFIG_SPL_BUILD),y)
$(warning CONFIG_TARGET_ZYNQ_ZC70X is deprecated.)
$(warning Enable CONFIG_TARGET_ZYNQ_ZC702 or CONFIG_TARGET_ZYNQ_706 instead.)
$(warning "make zynq_zc70x_defconfig" is also deprecated.)
$(warning Use "make zynq_zc702_defconfig" or "make zynq_zc706_defconfig".)
endif
endif

15
configs/zynq_zc70x_defconfig
View File

@ -1,15 +0,0 @@
CONFIG_ARM=y
CONFIG_ARCH_ZYNQ=y
CONFIG_TARGET_ZYNQ_ZC70X=y
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"
CONFIG_SPL=y
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_FIT_SIGNATURE=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_SETEXPR is not set
CONFIG_OF_SEPARATE=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPI_FLASH=y
CONFIG_ZYNQ_QSPI=y