From: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Date: Tue, 28 Aug 2012 09:13:59 +0000 (+0530)
Subject: Xilinx: ARM: drop XILINX_PSS_QSPI_USE_DUAL_FLASH references for zynq
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78cd060986a3ec0f4ed1ff74c4d67a474f171f59;p=thirdparty%2Fu-boot.git

Xilinx: ARM: drop XILINX_PSS_QSPI_USE_DUAL_FLASH references for zynq

Now the dual qspi flash memory detection is done at runtime
based on the MIO's configurations.
So there is no much point to check this macro on zynq qspi and
board code hence removed the references.

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

diff --git a/boards.cfg b/boards.cfg
index 5b4d6a02751..dc0b4363826 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -225,7 +225,6 @@ zynq_zc770_XM012             arm         armv7       zynq_common         xilinx
 zynq_zc770_XM013             arm         armv7       zynq_common         xilinx         zynq	zynq_zc770:ZC770_XM013
 zynq_afx_nor                 arm         armv7       zynq_common         xilinx         zynq	zynq_afx:AFX_NOR
 zynq_afx_qspi                arm         armv7       zynq_common         xilinx         zynq	zynq_afx:AFX_QSPI
-zynq_afx_qspi_dual           arm         armv7       zynq_common         xilinx         zynq	zynq_afx:AFX_QSPI,XILINX_PSS_QSPI_USE_DUAL_FLASH
 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
diff --git a/include/configs/zynq_zc702.h b/include/configs/zynq_zc702.h
index 5fc72b39cfb..8011266c561 100644
--- a/include/configs/zynq_zc702.h
+++ b/include/configs/zynq_zc702.h
@@ -74,7 +74,6 @@
 #define CONFIG_SF_DEFAULT_SPEED 30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_CMD_SF
-/* #define CONFIG_XILINX_PSS_QSPI_USE_DUAL_FLASH */
 #define CONFIG_SPI_FLASH_STMICRO
 
 /* Place a Xilinx Boot ROM header in u-boot image? */
diff --git a/include/configs/zynq_zc706.h b/include/configs/zynq_zc706.h
index 7f0dba0c93b..870740be4da 100644
--- a/include/configs/zynq_zc706.h
+++ b/include/configs/zynq_zc706.h
@@ -30,7 +30,6 @@
 #undef CONFIG_ZC702
 
 /* ZC706 QSPI settings */
-#define CONFIG_XILINX_PSS_QSPI_USE_DUAL_FLASH
 #define CONFIG_SPI_FLASH_SPANSION
 
 #endif /* __CONFIG_ZYNQ_ZC706_H */
diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index f1cf46aa4f1..07ffffb6820 100644
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -132,7 +132,6 @@
 #define CONFIG_GEM1
 #define CONFIG_TTC1
 #define CONFIG_SPI_FLASH_SPANSION
-#define CONFIG_XILINX_PSS_QSPI_USE_DUAL_FLASH
 #endif
 
 #if defined(CONFIG_ZC770_XM010)