ARM: zynq: Move ZYNQ_QSPI to Kconfig

And clean appropriate config headers.

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 9ca1bd17847432b09960376397a524604730010d..16b392a20d713930345a309f6f4a691c73a61dd5 100644 (file)
--- a/configs/zynq_afx_qspi_RSA_defconfig
+++ b/configs/zynq_afx_qspi_RSA_defconfig
@@ -5,9 +5,9 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-afx-qspi"
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
-CONFIG_SYS_EXTRA_OPTIONS="AFX_QSPI"
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y
+CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_afx_qspi_defconfig b/configs/zynq_afx_qspi_defconfig
index 6622722489c1c9275785aea8b309541acc533734..8e8b375e85a13ce13502af9508baf818757e6db8 100644 (file)
--- a/configs/zynq_afx_qspi_defconfig
+++ b/configs/zynq_afx_qspi_defconfig
@@ -2,8 +2,8 @@ CONFIG_ARM=y
 CONFIG_ARCH_ZYNQ=y
 CONFIG_TARGET_ZYNQ_AFX=y
 CONFIG_DEFAULT_DEVICE_TREE="zynq-afx-qspi"
-CONFIG_SYS_EXTRA_OPTIONS="AFX_QSPI"
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y
+CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_cc108_defconfig b/configs/zynq_cc108_defconfig
index 74c446b9aa3093ac8095fddbed6e52fb56f2e84a..e9ed330d8d84e7d0256843bff87e2b0a8d79c2c9 100644 (file)
--- a/configs/zynq_cc108_defconfig
+++ b/configs/zynq_cc108_defconfig
@@ -7,3 +7,4 @@ CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y
+CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig
index 75a970ab09626f9923dff83f50d0b72d4222e2fb..d30341add4cffff3091fb7cfc0271ecb957ab0c7 100644 (file)
--- a/configs/zynq_cse_qspi_defconfig
+++ b/configs/zynq_cse_qspi_defconfig
@@ -33,3 +33,4 @@ CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_MISC is not set
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y
+CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zc770_xm013_RSA_defconfig b/configs/zynq_zc770_xm013_RSA_defconfig
index 3ab24f8862e701babb0c47a52880759771983d03..37a99f5e41930c5df0d52d345190f3dc7ce20336 100644 (file)
--- a/configs/zynq_zc770_xm013_RSA_defconfig
+++ b/configs/zynq_zc770_xm013_RSA_defconfig
@@ -6,7 +6,6 @@ CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
-CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
@@ -14,3 +13,4 @@ CONFIG_SYS_PROMPT="Zynq> "
 CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y
+CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
index 8cf58420e8a1609ccaaaf881a4cc197f44a2e01d..7c01895a85ef7af8b876e78e965e84e72642b2d5 100644 (file)
--- a/configs/zynq_zc770_xm013_defconfig
+++ b/configs/zynq_zc770_xm013_defconfig
@@ -6,7 +6,6 @@ CONFIG_SPL=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
-CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
 CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
@@ -16,3 +15,4 @@ CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
 CONFIG_ZYNQ_GEM=y
+CONFIG_ZYNQ_QSPI=y

diff --git a/include/configs/zynq_afx.h b/include/configs/zynq_afx.h
index dd21113569905d7bc569c6b4fb44174c9e19c4c9..59631e40dfbcd1e42854196261222501f4eb0b61 100644 (file)
--- a/include/configs/zynq_afx.h
+++ b/include/configs/zynq_afx.h
@@ -17,8 +17,6 @@
 #define CONFIG_SYS_NO_FLASH
 #if defined(CONFIG_AFX_NOR)
 # undef CONFIG_SYS_NO_FLASH
-#elif defined(CONFIG_AFX_QSPI)
-# define CONFIG_ZYNQ_QSPI
 #elif defined(CONFIG_AFX_NAND)
 # define CONFIG_NAND_ZYNQ
 #endif

diff --git a/include/configs/zynq_cc108.h b/include/configs/zynq_cc108.h
index f5326e37eefcf4df73c9d2ed4368a1c1646e48d3..a9f7eca35b4a88b50e2ed1bf4f70344392a89367 100644 (file)
--- a/include/configs/zynq_cc108.h
+++ b/include/configs/zynq_cc108.h
@@ -34,7 +34,6 @@
 #define CONFIG_SYS_NO_FLASH
 
 #define CONFIG_ZYNQ_SDHCI1
-#define CONFIG_ZYNQ_QSPI
 #define CONFIG_ZYNQ_BOOT_FREEBSD
 
 #include <configs/zynq-common.h>

diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h
index fbe034c8925bbd098f42c5ddc78d0ad0572c3c74..b83ca92a6b42736db3f3fe47ae36a5934b3acf3d 100644 (file)
--- a/include/configs/zynq_cse.h
+++ b/include/configs/zynq_cse.h
@@ -19,10 +19,7 @@
 #define CONFIG_SYS_ICACHE_OFF
 #define CONFIG_FIT_DISABLE_SHA256
 
-#if defined(CONFIG_CSE_QSPI)
-# define CONFIG_ZYNQ_QSPI
-
-#elif defined(CONFIG_CSE_NAND)
+#if defined(CONFIG_CSE_NAND)
 # define CONFIG_NAND_ZYNQ
 
 #elif defined(CONFIG_CSE_NOR)

diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index 03e620dc7af93024e6c209a39e8df58458ab7f81..3d7306428b6d3228d7789e7fbe575d95213a0303 100644 (file)
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -25,9 +25,6 @@
 #elif defined(CONFIG_ZC770_XM012)
 # undef CONFIG_SYS_NO_FLASH
 
-#elif defined(CONFIG_ZC770_XM013)
-# define CONFIG_ZYNQ_QSPI
-
 #endif
 
 #include <configs/zynq-common.h>