zynq: config: Enable CONFIG_SYS_NO_FLASH through defconfig

Enable config CONFIG_SYS_NO_FLASH through defconfig
for all zynq boards.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/configs/zynq_cc108_defconfig b/configs/zynq_cc108_defconfig
index ebb5506caebdbd46ed594f54f6de1082b8689356..a64f0a3befe716410523c6a62d342502dc68ce3d 100644 (file)
--- a/configs/zynq_cc108_defconfig
+++ b/configs/zynq_cc108_defconfig
@@ -5,6 +5,7 @@ CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
+CONFIG_SYS_NO_FLASH=y
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set
 CONFIG_OF_EMBED=y

diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index 97fd50b54da964173d4af18d18d9b6065c1ff670..9b7c9cb6e15a84ee14e51dbe2012657c7a64bfe0 100644 (file)
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
+CONFIG_SYS_NO_FLASH=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
index 89b699557c5b947aad47ed3030a7b93d21b03a78..42701dcca9fe28839afc2d5c4c109c2d1fc246c5 100644 (file)
--- a/configs/zynq_picozed_defconfig
+++ b/configs/zynq_picozed_defconfig
@@ -3,6 +3,7 @@ CONFIG_SYS_CONFIG_NAME="zynq_picozed"
 CONFIG_ARCH_ZYNQ=y
 CONFIG_DEFAULT_DEVICE_TREE="zynq-picozed"
 CONFIG_SPL=y
+CONFIG_SYS_NO_FLASH=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/zynq_zc702_RSA_defconfig b/configs/zynq_zc702_RSA_defconfig
index cf210f99bb3b60721cf1de577486ff00b0f5cb6e..7d23a5bb859cb28a86a52bbcbd93461f74d40e2b 100644 (file)
--- a/configs/zynq_zc702_RSA_defconfig
+++ b/configs/zynq_zc702_RSA_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
+CONFIG_SYS_NO_FLASH=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
index f6e4c28d3730de841f746d0c0aba5dbe432cf361..4c83fdb97fc0fdd8ca3c66bfaf9de72473bb17a2 100644 (file)
--- a/configs/zynq_zc702_defconfig
+++ b/configs/zynq_zc702_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
+CONFIG_SYS_NO_FLASH=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index 421d4d9c9790e30168baf02549ffb9c307bf375f..02a49d88311990a51778da62be3a4e065553f11c 100644 (file)
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
+CONFIG_SYS_NO_FLASH=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
index 153a8c0d8a836114dafea6e5d3985e229ba37651..0467f490ea487db9593022a4dca5c489e43e8406 100644 (file)
--- a/configs/zynq_zc770_xm010_defconfig
+++ b/configs/zynq_zc770_xm010_defconfig
@@ -8,6 +8,7 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
+CONFIG_SYS_NO_FLASH=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig
index c0b066ba2bcc0d012c26a35afcdaf5992e2631cd..9b93002fbb4a06ecfb92140d32a1898e0f4a9f92 100644 (file)
--- a/configs/zynq_zc770_xm011_defconfig
+++ b/configs/zynq_zc770_xm011_defconfig
@@ -7,6 +7,7 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM011"
+CONFIG_SYS_NO_FLASH=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
index 48a68e89dd3f7c471c240fd4666a7720ddbe46b9..9cf019ae55e45e1768e447eb0383aeda41dde234 100644 (file)
--- a/configs/zynq_zc770_xm013_defconfig
+++ b/configs/zynq_zc770_xm013_defconfig
@@ -7,6 +7,7 @@ CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
+CONFIG_SYS_NO_FLASH=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index 1cd81946ee428b7c22544ecdaad12725ce713ebd..47b893782e6f069fa3031cb767fae7ef859eb9d0 100644 (file)
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
+CONFIG_SYS_NO_FLASH=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index f8dfa3647d57373d79eb55ec0f4de5b8bc8bfe2e..dc8d6631091638b0efab0a04e73f40de7e7dbd3a 100644 (file)
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -6,6 +6,7 @@ CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
+CONFIG_SYS_NO_FLASH=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set

diff --git a/include/configs/zynq_cc108.h b/include/configs/zynq_cc108.h
index c2ecde40673e733e7548c7e72483bab19c01efb3..2d0de05fccba81cded39858150a80b707b974f28 100644 (file)
--- a/include/configs/zynq_cc108.h
+++ b/include/configs/zynq_cc108.h
@@ -25,8 +25,6 @@
  */
 #define CONFIG_ENV_OFFSET      0xF00000
 
-#define CONFIG_SYS_NO_FLASH
-
 #define CONFIG_ZYNQ_SDHCI1
 
 #include <configs/zynq-common.h>

diff --git a/include/configs/zynq_microzed.h b/include/configs/zynq_microzed.h
index e66088da4f795961ec4bc30e6b41de4a281a2c83..53b12878b2f6c24eaa7d993c0859ce63fef3e9cd 100644 (file)
--- a/include/configs/zynq_microzed.h
+++ b/include/configs/zynq_microzed.h
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_ZYNQ_MICROZED_H
 #define __CONFIG_ZYNQ_MICROZED_H
 
-#define CONFIG_SYS_NO_FLASH
-
 #include <configs/zynq-common.h>
 
 #endif /* __CONFIG_ZYNQ_MICROZED_H */

diff --git a/include/configs/zynq_picozed.h b/include/configs/zynq_picozed.h
index f2598a2bb8f9b0f14f4f56c7f56c56188875eb7c..119722a7f189f75a417a9e4b941db4f609904e4a 100644 (file)
--- a/include/configs/zynq_picozed.h
+++ b/include/configs/zynq_picozed.h
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_ZYNQ_PICOZED_H
 #define __CONFIG_ZYNQ_PICOZED_H
 
-#define CONFIG_SYS_NO_FLASH
-
 #include <configs/zynq-common.h>
 
 #endif /* __CONFIG_ZYNQ_PICOZED_H */

diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index a27b49cdf2b9299cf6f4ba450199fbaa8b781376..fc46fec9cc8e1c06940926f000e986de5035cf82 100644 (file)
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_ZYNQ_ZC70X_H
 #define __CONFIG_ZYNQ_ZC70X_H
 
-#define CONFIG_SYS_NO_FLASH
-
 #define CONFIG_ZYNQ_I2C0
 #define CONFIG_ZYNQ_EEPROM
 

diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index af28f7bf4ded1e25bcb89d913f20b249ee6fcf1a..d9124a237caef5f3bd254c0aefd2b74c96bce804 100644 (file)
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -10,14 +10,8 @@
 #ifndef __CONFIG_ZYNQ_ZC770_H
 #define __CONFIG_ZYNQ_ZC770_H
 
-#define CONFIG_SYS_NO_FLASH
-
 #if defined(CONFIG_ZC770_XM011)
 # define CONFIG_NAND_ZYNQ
-
-#elif defined(CONFIG_ZC770_XM012)
-# undef CONFIG_SYS_NO_FLASH
-
 #endif
 
 #include <configs/zynq-common.h>

diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index dbb4621a5e817dfcf9f0787a257a8a990b6ba967..ece0629f59c0bd41e2e2d16409ea13a6b206bb54 100644 (file)
--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@ -10,8 +10,6 @@
 #ifndef __CONFIG_ZYNQ_ZED_H
 #define __CONFIG_ZYNQ_ZED_H
 
-#define CONFIG_SYS_NO_FLASH
-
 #include <configs/zynq-common.h>
 
 #endif /* __CONFIG_ZYNQ_ZED_H */

diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
index ca3ad9c915843d79c3cc545e7ecc8e0ba80836fe..b9ff39145873ac2911f04ddb15eda520e4be80c2 100644 (file)
--- a/include/configs/zynq_zybo.h
+++ b/include/configs/zynq_zybo.h
@@ -11,8 +11,6 @@
 #ifndef __CONFIG_ZYNQ_ZYBO_H
 #define __CONFIG_ZYNQ_ZYBO_H
 
-#define CONFIG_SYS_NO_FLASH
-
 #define CONFIG_ZYNQ_I2C0
 #define CONFIG_ZYNQ_I2C1
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1