Xilinx: ARM: Create zc70x config file to support zc702 and zc706 boards

Support to detect dual qspi flash memory is based on the MIO's
configuration is added.
Therefore, no need to have separate config files for zc702 and zc706.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>

diff --git a/boards.cfg b/boards.cfg
index dc0b43638260115db494ac809a52bd761cdcaf9b..3bd8469f6082e91e20575276823e5ac25d6ea261 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -227,8 +227,7 @@ zynq_afx_nor                 arm         armv7       zynq_common         xilinx
 zynq_afx_qspi                arm         armv7       zynq_common         xilinx         zynq   zynq_afx:AFX_QSPI
 zynq_afx_nand                arm         armv7       zynq_common         xilinx         zynq   zynq_afx:AFX_NAND
 zynq_afx_nand_16b            arm         armv7       zynq_common         xilinx         zynq   zynq_afx:AFX_NAND,XILINX_ZYNQ_NAND_BUSWIDTH_16
-zynq_zc702                   arm         armv7       zynq_common         xilinx         zynq
-zynq_zc706                   arm         armv7       zynq_common         xilinx         zynq
+zynq_zc70x                   arm         armv7       zynq_common         xilinx         zynq
 zynq_cseflash                arm         armv7       zynq_common         xilinx         zynq
 zynq_zed                     arm         armv7       zynq_common         xilinx         zynq
 omap5_evm                    arm         armv7       omap5_evm           ti            omap5

diff --git a/include/configs/zynq_zc706.h b/include/configs/zynq_zc706.h
deleted file mode 100644 (file)
index 870740b..0000000
--- a/include/configs/zynq_zc706.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * (C) Copyright 2012 Xilinx
- *
- * Configuration settings for the Xilinx Zynq ZC706 board.
- * See zynq_zc702.h as most of the board headers for both
- * are similar
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef __CONFIG_ZYNQ_ZC706_H
-#define __CONFIG_ZYNQ_ZC706_H
-
-/*
- * High Level Configuration Options
- */
-#define CONFIG_ZC706 /* Board */
-
-/* ZC702 board headers */
-#include <configs/zynq_zc702.h>
-
-#undef CONFIG_ZC702
-
-/* ZC706 QSPI settings */
-#define CONFIG_SPI_FLASH_SPANSION
-
-#endif /* __CONFIG_ZYNQ_ZC706_H */

diff --git a/include/configs/zynq_zc702.h b/include/configs/zynq_zc70x.h
similarity index 91%
rename from include/configs/zynq_zc702.h
rename to include/configs/zynq_zc70x.h
index 8011266c561d8806d383d4c21d856f2abdfe26b4..660ff3691027d9f4144a5de1ed002c3d496234e6 100644 (file)
--- a/include/configs/zynq_zc702.h
+++ b/include/configs/zynq_zc70x.h
@@ -1,7 +1,7 @@
 /*
  * (C) Copyright 2012 Xilinx
  *
- * Configuration settings for the Xilinx Zynq ZC702 board.
+ * Configuration settings for the Xilinx Zynq ZC702 and ZC706 boards
  * See zynq_common.h for Zynq common configs
  *
  * This program is free software; you can redistribute it and/or
@@ -15,13 +15,14 @@
  * MA 02111-1307 USA
  */
 
-#ifndef __CONFIG_ZYNQ_ZC702_H
-#define __CONFIG_ZYNQ_ZC702_H
+#ifndef __CONFIG_ZYNQ_ZC70X_H
+#define __CONFIG_ZYNQ_ZC70X_H
 
 /*
  * High Level Configuration Options
  */
 #define CONFIG_ZC702 /* Board */
+#define CONFIG_ZC706 /* Board */
 
 #include <configs/zynq_common.h>
 
@@ -75,6 +76,7 @@
 #define CONFIG_SPI_FLASH
 #define CONFIG_CMD_SF
 #define CONFIG_SPI_FLASH_STMICRO
+#define CONFIG_SPI_FLASH_SPANSION
 
 /* Place a Xilinx Boot ROM header in u-boot image? */
 #undef CONFIG_ZYNQ_XILINX_FLASH_HEADER
@@ -98,4 +100,4 @@
 #define CONFIG_DOS_PARTITION
 #endif
 
-#endif /* __CONFIG_ZYNQ_ZC702_H */
+#endif /* __CONFIG_ZYNQ_ZC70X_H */