zynq: defconfig: Move spi flash entries to defconfig

This is the part of common config cleanup.

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

diff --git a/configs/zynq_afx_qspi_RSA_defconfig b/configs/zynq_afx_qspi_RSA_defconfig
index 65d59abad223d860662cce49a2a59a5d513d4201..b31b76ff5b39c973cf8abee630fb35dbe28f4ba3 100644 (file)
--- a/configs/zynq_afx_qspi_RSA_defconfig
+++ b/configs/zynq_afx_qspi_RSA_defconfig
@@ -11,4 +11,9 @@ CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_ISSI=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_afx_qspi_defconfig b/configs/zynq_afx_qspi_defconfig
index 8edc4ef8ec207341ce9aaa5e081cd755ce9c1758..fcdece95495cda2c1bbcb9679810ebc7ac332382 100644 (file)
--- a/configs/zynq_afx_qspi_defconfig
+++ b/configs/zynq_afx_qspi_defconfig
@@ -7,4 +7,9 @@ CONFIG_SYS_PROMPT="Zynq> "
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_ISSI=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_cc108_defconfig b/configs/zynq_cc108_defconfig
index 0c30d8795c39d9d7e043a28c87ec6780aa46efee..fdc76fae0af336e422df927bdc72334718e93d76 100644 (file)
--- a/configs/zynq_cc108_defconfig
+++ b/configs/zynq_cc108_defconfig
@@ -8,4 +8,9 @@ CONFIG_SYS_PROMPT="Zynq> "
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_ISSI=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig
index 9dfd8bc0abb93a61c67a1c669f4d84c172107220..306b5592d0e08427eacca32f04b3ecbaca636ca9 100644 (file)
--- a/configs/zynq_cse_qspi_defconfig
+++ b/configs/zynq_cse_qspi_defconfig
@@ -34,4 +34,9 @@ CONFIG_SYS_PROMPT="Zynq> "
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_ISSI=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index 7232705ec8f0008c984db8d3f6accd1ef6d1ad39..2b51e868ce32dd83b67ca01c250117d4c57437cb 100644 (file)
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -16,5 +16,8 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zc702_RSA_defconfig b/configs/zynq_zc702_RSA_defconfig
index a3ab284e1abd405b2c0c5b93124af8fd1fd22cc4..ebbc35ca46b0bf44ce63ba9d60738a5009a6c50d 100644 (file)
--- a/configs/zynq_zc702_RSA_defconfig
+++ b/configs/zynq_zc702_RSA_defconfig
@@ -16,6 +16,11 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_ISSI=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_UART_ZYNQ=y

diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
index ab710444a0436bf08354e07642d64a9c3ea9eb6e..cb9946f3313214331b0fb1a17561d5526d10b450 100644 (file)
--- a/configs/zynq_zc702_defconfig
+++ b/configs/zynq_zc702_defconfig
@@ -15,6 +15,11 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_ISSI=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_UART_ZYNQ=y

diff --git a/configs/zynq_zc706_RSA_defconfig b/configs/zynq_zc706_RSA_defconfig
index ae4264786ccfe9235406bec24c000e0cf986689a..40af947c973af020847257cff7060620bd5253c7 100644 (file)
--- a/configs/zynq_zc706_RSA_defconfig
+++ b/configs/zynq_zc706_RSA_defconfig
@@ -17,5 +17,10 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_ISSI=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index 699d0ff9d66a7e348bafcae1585356a069c3006a..df1f444c88d36585390600245eac43ccb42d275b 100644 (file)
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -16,5 +16,10 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_ISSI=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zc770_xm010_RSA_defconfig b/configs/zynq_zc770_xm010_RSA_defconfig
index 282c4b56252c26364bb9bfd74f8dd1d897ee3d88..04d8c387dbf5e68f4e227d9adcb8a26bcc0cc581 100644 (file)
--- a/configs/zynq_zc770_xm010_RSA_defconfig
+++ b/configs/zynq_zc770_xm010_RSA_defconfig
@@ -15,4 +15,11 @@ CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_ISSI=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_ZYNQ_SPI=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
index c8745987017cf225ce24353f192cd78c36303f2d..d4765816fbbe1557fe4687a9fab8a06b085925ac 100644 (file)
--- a/configs/zynq_zc770_xm010_defconfig
+++ b/configs/zynq_zc770_xm010_defconfig
@@ -17,6 +17,12 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_ISSI=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_SST=y
+CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_SPI=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
index 9a13b86452423084ea71b03233d0e4b8565c0bc3..8a375013f30d4f4aa337ad5eac6d5241c7b682d3 100644 (file)
--- a/configs/zynq_zc770_xm013_defconfig
+++ b/configs/zynq_zc770_xm013_defconfig
@@ -16,5 +16,10 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_ISSI=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zed_RSA_defconfig b/configs/zynq_zed_RSA_defconfig
index 245aa07bab9ecbc9c3ff99035cfd9a48410d527d..700eeaec1594f794338b0799a84ba088af95c450 100644 (file)
--- a/configs/zynq_zed_RSA_defconfig
+++ b/configs/zynq_zed_RSA_defconfig
@@ -14,4 +14,9 @@ CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_ISSI=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index 56ff9425c68df746448478959e0f9ce6c40640c8..4ab7da8b15a1ec78d24bfd39dd175876e938dcf0 100644 (file)
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -16,5 +16,8 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index c0f2bfa8401021eaa5a551ed231a513859b4dcd3..1b9814e0d41f75054904077013a8a337406f3d71 100644 (file)
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -16,6 +16,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_DEBUG_UART=y
 CONFIG_DEBUG_UART_ZYNQ=y

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 13a06342189e0118e08592cdd03e84b225d6c401..e8423f3a49eb6466625c2c1eaed3d47387260a89 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -66,10 +66,6 @@
 /* QSPI */
 #ifdef CONFIG_ZYNQ_QSPI
 # define CONFIG_SF_DEFAULT_SPEED       30000000
-# define CONFIG_SPI_FLASH_STMICRO
-# define CONFIG_SPI_FLASH_WINBOND
-# define CONFIG_SPI_FLASH_ISSI
-# define CONFIG_SPI_FLASH_MACRONIX
 # define CONFIG_CMD_SF
 # define CONFIG_SF_DUAL_FLASH
 #endif