From: Michal Simek <monstr@monstr.eu>
Date: Mon, 24 Sep 2012 13:39:54 +0000 (+0200)
Subject: zynq: Fix CONFIG_ZYNQ_XILINX_FLASH_HEADER usage
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a1a003fd165c39b9bde54ab53c30f29115ef2f7;p=thirdparty%2Fu-boot.git

zynq: Fix CONFIG_ZYNQ_XILINX_FLASH_HEADER usage

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

diff --git a/include/configs/zynq_afx.h b/include/configs/zynq_afx.h
index 27c19826d04..6fb4de4a44c 100644
--- a/include/configs/zynq_afx.h
+++ b/include/configs/zynq_afx.h
@@ -31,22 +31,12 @@
 # define CONFIG_NAND_ZYNQ
 #endif
 
-
 #include <configs/zynq_common.h>
 
-#if defined(CONFIG_AFX_NOR) || defined(CONFIG_AFX_QSPI)
 /* Place a Xilinx Boot ROM header in u-boot image? */
-#define CONFIG_ZYNQ_XILINX_FLASH_HEADER
-#endif
-
-/*
- * SPI Settings
- */
 #if defined(CONFIG_AFX_QSPI)
-#ifdef CONFIG_ZYNQ_XILINX_FLASH_HEADER
-/* Address Xilinx boot rom should use to launch u-boot */
+#define CONFIG_ZYNQ_XILINX_FLASH_HEADER
 #define CONFIG_ZYNQ_XIP_START XPSS_QSPI_LIN_BASEADDR
 #endif
-#endif
 
 #endif /* __CONFIG_ZYNQ_AFX_H */
diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h
index 73f64bc5db4..6f2b0bfc44b 100644
--- a/include/configs/zynq_common.h
+++ b/include/configs/zynq_common.h
@@ -101,9 +101,6 @@
 #  define CONFIG_ENV_SECT_SIZE    	0x20000		/*128 KB*/
 #  define CONFIG_ENV_IS_IN_FLASH
 #  define CONFIG_CMD_SAVEENV	/* Command to save ENV to Flash */
-#  ifdef CONFIG_ZYNQ_XILINX_FLASH_HEADER
-#   define CONFIG_ZYNQ_XIP_START CONFIG_SYS_FLASH_BASE
-#  endif
 # endif
 #endif
 
diff --git a/include/configs/zynq_cseflash.h b/include/configs/zynq_cseflash.h
index 61e7c853aaf..4bb3cc28f5d 100644
--- a/include/configs/zynq_cseflash.h
+++ b/include/configs/zynq_cseflash.h
@@ -73,10 +73,6 @@
 
 /* Place a Xilinx Boot ROM header in u-boot image? */
 #define CONFIG_ZYNQ_XILINX_FLASH_HEADER
-
-#ifdef CONFIG_ZYNQ_XILINX_FLASH_HEADER
-/* NOR */
 #define CONFIG_ZYNQ_XIP_START CONFIG_SYS_FLASH_BASE
-#endif
 
 #endif /* __CONFIG_H */
diff --git a/include/configs/zynq_ep107.h b/include/configs/zynq_ep107.h
index 347777e351a..442e762b9fe 100644
--- a/include/configs/zynq_ep107.h
+++ b/include/configs/zynq_ep107.h
@@ -74,14 +74,8 @@
 #undef CONFIG_FIT
 #undef CONFIG_FIT_VERBOSE
 
-
 /* Place a Xilinx Boot ROM header in u-boot image? */
 #define CONFIG_ZYNQ_XILINX_FLASH_HEADER
-
-#ifdef CONFIG_ZYNQ_XILINX_FLASH_HEADER
-/* Address Xilinx boot rom should use to launch u-boot */
-/* NOR */
 #define CONFIG_ZYNQ_XIP_START CONFIG_SYS_FLASH_BASE
-#endif
 
 #endif /* __CONFIG_ZYNQ_EP107_H */
diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index f2c07a2c947..c511577cefa 100644
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -50,19 +50,10 @@
 
 #include <configs/zynq_common.h>
 
-#if defined(CONFIG_ZC770_XM010) || defined(CONFIG_ZC770_XM012)
 /* Place a Xilinx Boot ROM header in u-boot image? */
+#if defined(CONFIG_ZC770_XM010)
 #define CONFIG_ZYNQ_XILINX_FLASH_HEADER
-#endif
-
-/*
- * SPI Settings
- */
-#if defined(CONFIG_ZC770_XM010) || defined(CONFIG_ZC770_XM013)
-#ifdef CONFIG_ZYNQ_XILINX_FLASH_HEADER
-/* Address Xilinx boot rom should use to launch u-boot */
 #define CONFIG_ZYNQ_XIP_START XPSS_QSPI_LIN_BASEADDR
 #endif
-#endif
 
 #endif /* __CONFIG_ZYNQ_ZC770_H */