Xilinx: ARM: Move CONFIG_SYS_NO_FLASH in zynq configs

CONFIG_SYS_NO_FLASH must be defined before you include
config_cmd_default.h so that CMD_IMLS will not be defined

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>

diff --git a/include/configs/xpele.h b/include/configs/xpele.h
index bb70405c574f5f7eaf7a04124c4181406fc15f69..2e9314aace019388f9ff1cdff34693cad41f0560 100644 (file)
--- a/include/configs/xpele.h
+++ b/include/configs/xpele.h
@@ -89,6 +89,9 @@
 #define        CONFIG_PSS_SERIAL
 #define        CONFIG_RTC_XPSSRTC
 
+/* Uncomment it if you don't want Flash */
+//#define CONFIG_SYS_NO_FLASH  
+
 #include <config_cmd_default.h>        
 #define CONFIG_CMD_DATE                /* RTC? */
 #define CONFIG_CMD_PING                /* Might be useful for debugging */
@@ -111,9 +114,6 @@
 
 #undef CONFIG_SKIP_RELOCATE_UBOOT      
 
-/* Uncomment it if you don't want Flash */
-//#define CONFIG_SYS_NO_FLASH  
-
 #define CONFIG_SYS_SDRAM_BASE  0
 
 #define CONFIG_L2_OFF

diff --git a/include/configs/zynq_zc702.h b/include/configs/zynq_zc702.h
index c7cc018b31da57bd212ca6aead615ec1892e4711..a2cd976b60fcfa1d16156f9bcc15051d8193b78b 100644 (file)
--- a/include/configs/zynq_zc702.h
+++ b/include/configs/zynq_zc702.h
@@ -84,6 +84,9 @@
 #define        CONFIG_PSS_SERIAL
 #define        CONFIG_RTC_XPSSRTC
 
+/* Uncomment it if you don't want Flash */
+//#define CONFIG_SYS_NO_FLASH  
+
 #include <config_cmd_default.h>        
 #define CONFIG_CMD_DATE                /* RTC? */
 #define CONFIG_CMD_PING                /* Might be useful for debugging */
@@ -106,9 +109,6 @@
 
 #undef CONFIG_SKIP_RELOCATE_UBOOT      
 
-/* Uncomment it if you don't want Flash */
-//#define CONFIG_SYS_NO_FLASH  
-
 #define CONFIG_SYS_SDRAM_BASE  0
 
 #define CONFIG_L2_OFF

diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index c7cc018b31da57bd212ca6aead615ec1892e4711..a2cd976b60fcfa1d16156f9bcc15051d8193b78b 100644 (file)
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -84,6 +84,9 @@
 #define        CONFIG_PSS_SERIAL
 #define        CONFIG_RTC_XPSSRTC
 
+/* Uncomment it if you don't want Flash */
+//#define CONFIG_SYS_NO_FLASH  
+
 #include <config_cmd_default.h>        
 #define CONFIG_CMD_DATE                /* RTC? */
 #define CONFIG_CMD_PING                /* Might be useful for debugging */
@@ -106,9 +109,6 @@
 
 #undef CONFIG_SKIP_RELOCATE_UBOOT      
 
-/* Uncomment it if you don't want Flash */
-//#define CONFIG_SYS_NO_FLASH  
-
 #define CONFIG_SYS_SDRAM_BASE  0
 
 #define CONFIG_L2_OFF