On 19.7.2016 07:13, Siva Durga Prasad Paladugu wrote:
Remove unnecessary board specifc config files for zynq boards(microzed, picozed, ZC770(all), zed) and point to zynq common config file.
Signed-off-by: Siva Durga Prasad Paladugu sivadur@xilinx.com
Changes for v2:
- Newly added in series
configs/zynq_microzed_defconfig | 2 +- configs/zynq_picozed_defconfig | 2 +- configs/zynq_zc770_xm010_defconfig | 2 +- configs/zynq_zc770_xm011_defconfig | 2 +- configs/zynq_zc770_xm012_defconfig | 2 +- configs/zynq_zc770_xm013_defconfig | 2 +- configs/zynq_zed_defconfig | 2 +- include/configs/zynq_microzed.h | 15 --------------- include/configs/zynq_picozed.h | 15 --------------- include/configs/zynq_zc770.h | 15 --------------- include/configs/zynq_zed.h | 15 --------------- 11 files changed, 7 insertions(+), 67 deletions(-) delete mode 100644 include/configs/zynq_microzed.h delete mode 100644 include/configs/zynq_picozed.h delete mode 100644 include/configs/zynq_zc770.h delete mode 100644 include/configs/zynq_zed.h
diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index ecda988..b034234 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="zynq_microzed" +CONFIG_SYS_CONFIG_NAME="zynq-common" CONFIG_ARCH_ZYNQ=y CONFIG_DEFAULT_DEVICE_TREE="zynq-microzed" CONFIG_SPL=y diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig index 8c715d9..04d06e0 100644 --- a/configs/zynq_picozed_defconfig +++ b/configs/zynq_picozed_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="zynq_picozed" +CONFIG_SYS_CONFIG_NAME="zynq-common" CONFIG_ARCH_ZYNQ=y CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed" CONFIG_SPL=y diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig index ca8bf78..ced318d 100644 --- a/configs/zynq_zc770_xm010_defconfig +++ b/configs/zynq_zc770_xm010_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="zynq_zc770" +CONFIG_SYS_CONFIG_NAME="zynq-common" CONFIG_ARCH_ZYNQ=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010" CONFIG_SPL=y diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig index 669b205..e82b11e 100644 --- a/configs/zynq_zc770_xm011_defconfig +++ b/configs/zynq_zc770_xm011_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="zynq_zc770" +CONFIG_SYS_CONFIG_NAME="zynq-common" CONFIG_ARCH_ZYNQ=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm011" CONFIG_SPL=y diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig index a9ea971..6097a5e 100644 --- a/configs/zynq_zc770_xm012_defconfig +++ b/configs/zynq_zc770_xm012_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="zynq_zc770" +CONFIG_SYS_CONFIG_NAME="zynq-common" CONFIG_ARCH_ZYNQ=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012" CONFIG_SPL=y diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig index 24b2e4b..3e3f64e 100644 --- a/configs/zynq_zc770_xm013_defconfig +++ b/configs/zynq_zc770_xm013_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="zynq_zc770" +CONFIG_SYS_CONFIG_NAME="zynq-common" CONFIG_ARCH_ZYNQ=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013" CONFIG_SPL=y diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 7420fc1..1e8d151 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_SYS_CONFIG_NAME="zynq_zed" +CONFIG_SYS_CONFIG_NAME="zynq-common" CONFIG_ARCH_ZYNQ=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zed" CONFIG_SPL=y diff --git a/include/configs/zynq_microzed.h b/include/configs/zynq_microzed.h deleted file mode 100644 index 53b1287..0000000 --- a/include/configs/zynq_microzed.h +++ /dev/null @@ -1,15 +0,0 @@ -/*
- (C) Copyright 2013 Xilinx, Inc.
- Configuration for Micro Zynq Evaluation and Development Board - MicroZedBoard
- See zynq-common.h for Zynq common configs
- SPDX-License-Identifier: GPL-2.0+
- */
-#ifndef __CONFIG_ZYNQ_MICROZED_H -#define __CONFIG_ZYNQ_MICROZED_H
-#include <configs/zynq-common.h>
-#endif /* __CONFIG_ZYNQ_MICROZED_H */ diff --git a/include/configs/zynq_picozed.h b/include/configs/zynq_picozed.h deleted file mode 100644 index 119722a..0000000 --- a/include/configs/zynq_picozed.h +++ /dev/null @@ -1,15 +0,0 @@ -/*
- (C) Copyright 2015 Xilinx, Inc.
- Configuration for PicoZed
- See zynq-common.h for Zynq common configs
- SPDX-License-Identifier: GPL-2.0+
- */
-#ifndef __CONFIG_ZYNQ_PICOZED_H -#define __CONFIG_ZYNQ_PICOZED_H
-#include <configs/zynq-common.h>
-#endif /* __CONFIG_ZYNQ_PICOZED_H */ diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h deleted file mode 100644 index 7c6cf8d..0000000 --- a/include/configs/zynq_zc770.h +++ /dev/null @@ -1,15 +0,0 @@ -/*
- (C) Copyright 2013 Xilinx, Inc.
- Configuration settings for the Xilinx Zynq ZC770 board.
- See zynq-common.h for Zynq common configs
- SPDX-License-Identifier: GPL-2.0+
- */
-#ifndef __CONFIG_ZYNQ_ZC770_H -#define __CONFIG_ZYNQ_ZC770_H
-#include <configs/zynq-common.h>
-#endif /* __CONFIG_ZYNQ_ZC770_H */ diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h deleted file mode 100644 index ece0629..0000000 --- a/include/configs/zynq_zed.h +++ /dev/null @@ -1,15 +0,0 @@ -/*
- (C) Copyright 2013 Xilinx, Inc.
- Configuration for Zynq Evaluation and Development Board - ZedBoard
- See zynq-common.h for Zynq common configs
- SPDX-License-Identifier: GPL-2.0+
- */
-#ifndef __CONFIG_ZYNQ_ZED_H -#define __CONFIG_ZYNQ_ZED_H
-#include <configs/zynq-common.h>
-#endif /* __CONFIG_ZYNQ_ZED_H */
Will be applied when USB Kconfig patches http://lists.denx.de/pipermail/u-boot/2016-July/261103.html are reviewed because these two patches depends on it.
Thanks, Michal