From: Michal Simek <monstr@monstr.eu>
Date: Mon, 24 Sep 2012 12:37:10 +0000 (+0200)
Subject: zynq: Remove LQSPI useless function
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f546d9838f0c85e2baeeeaa03babc71a08651c75;p=thirdparty%2Fu-boot.git

zynq: Remove LQSPI useless function

Signed-off-by: Michal Simek <monstr@monstr.eu>
---

diff --git a/include/configs/zynq_cseflash.h b/include/configs/zynq_cseflash.h
index ab9fe6a7dfa..5a8e146cc39 100644
--- a/include/configs/zynq_cseflash.h
+++ b/include/configs/zynq_cseflash.h
@@ -19,9 +19,6 @@
  */
 #undef CONFIG_OF_LIBFDT
 
-#undef CONFIG_ZYNQ_XIL_LQSPI
-#undef CONFIG_RTC_XPSSRTC
-
 #undef CONFIG_SYS_NO_FLASH
 #define CONFIG_ENV_IS_NOWHERE
 
@@ -126,13 +123,8 @@
 #define CONFIG_ZYNQ_XILINX_FLASH_HEADER
 
 #ifdef CONFIG_ZYNQ_XILINX_FLASH_HEADER
-/* Address Xilinx boot rom should use to launch u-boot */
-#ifdef CONFIG_ZYNQ_XIL_LQSPI
-#define CONFIG_ZYNQ_XIP_START XPSS_QSPI_LIN_BASEADDR
-#else
 /* NOR */
 #define CONFIG_ZYNQ_XIP_START CONFIG_SYS_FLASH_BASE
 #endif
-#endif
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/zynq_ep107.h b/include/configs/zynq_ep107.h
index ece5987c140..f7bd6ab368b 100644
--- a/include/configs/zynq_ep107.h
+++ b/include/configs/zynq_ep107.h
@@ -28,8 +28,6 @@
 
 #include <configs/zynq_common.h>
 
-#undef CONFIG_ZYNQ_XIL_LQSPI
-
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS	\
 	"ethaddr=00:0a:35:00:01:22\0"	\
@@ -150,13 +148,9 @@
 
 #ifdef CONFIG_ZYNQ_XILINX_FLASH_HEADER
 /* Address Xilinx boot rom should use to launch u-boot */
-#ifdef CONFIG_ZYNQ_XIL_LQSPI
-#define CONFIG_ZYNQ_XIP_START XPSS_QSPI_LIN_BASEADDR
-#else
 /* NOR */
 #define CONFIG_ZYNQ_XIP_START CONFIG_SYS_FLASH_BASE
 #endif
-#endif
 
 /* Secure Digital */
 #define CONFIG_MMC
diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index 8cb4cc61a48..b6c61eec581 100644
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -24,8 +24,6 @@
 
 #include <configs/zynq_common.h>
 
-#undef CONFIG_ZYNQ_XIL_LQSPI
-
 /* no NOR on zc702 */
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_ENV_IS_NOWHERE
@@ -67,16 +65,6 @@
 #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
-
-#ifdef CONFIG_ZYNQ_XILINX_FLASH_HEADER
-/* Address Xilinx boot rom should use to launch u-boot */
-#ifdef CONFIG_ZYNQ_XIL_LQSPI
-#define CONFIG_ZYNQ_XIP_START XPSS_QSPI_LIN_BASEADDR
-#endif
-#endif
-
 /* Secure Digital */
 #define CONFIG_MMC
 
diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index 3d736fa08f8..6a18930c13b 100644
--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@ -24,8 +24,6 @@
 
 #include <configs/zynq_common.h>
 
-#undef CONFIG_ZYNQ_XIL_LQSPI
-
 /* No NOR Flash available on ZedBoard */
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_ENV_IS_NOWHERE
@@ -85,16 +83,6 @@
 #define CONFIG_CMD_SF
 #define CONFIG_SPI_FLASH_SPANSION
 
-/* Place a Xilinx Boot ROM header in u-boot image? */
-#undef CONFIG_ZYNQ_XILINX_FLASH_HEADER
-
-#ifdef CONFIG_ZYNQ_XILINX_FLASH_HEADER
-/* Address Xilinx boot rom should use to launch u-boot */
-#ifdef CONFIG_ZYNQ_XIL_LQSPI
-#define CONFIG_ZYNQ_XIP_START XPSS_QSPI_LIN_BASEADDR
-#endif
-#endif
-
 /* Secure Digital */
 #define CONFIG_MMC