ARM: zynq: Move FLASH_BAR to Kconfig

Clean up config and use Kconfig more.

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 16b392a20d713930345a309f6f4a691c73a61dd5..65d59abad223d860662cce49a2a59a5d513d4201 100644 (file)
--- a/configs/zynq_afx_qspi_RSA_defconfig
+++ b/configs/zynq_afx_qspi_RSA_defconfig
@@ -10,4 +10,5 @@ CONFIG_SYS_PROMPT="Zynq> "
 CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_afx_qspi_defconfig b/configs/zynq_afx_qspi_defconfig
index 8e8b375e85a13ce13502af9508baf818757e6db8..8edc4ef8ec207341ce9aaa5e081cd755ce9c1758 100644 (file)
--- a/configs/zynq_afx_qspi_defconfig
+++ b/configs/zynq_afx_qspi_defconfig
@@ -6,4 +6,5 @@ CONFIG_SYS_PROMPT="Zynq> "
 # CONFIG_CMD_IMLS is not set
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
 CONFIG_ZYNQ_QSPI=y

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

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

diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index a255d46d94ff71532d73435055c5fca880df0738..7b71d79b796a71a896220dbd26c214a91fca2bd4 100644 (file)
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -14,5 +14,6 @@ CONFIG_CMD_GPIO=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zc702_RSA_defconfig b/configs/zynq_zc702_RSA_defconfig
index b313dbbe98d53d094420ca56d68e81f2f1fc605c..862fd220e2851394b9b324a59b1e24d4244b348c 100644 (file)
--- a/configs/zynq_zc702_RSA_defconfig
+++ b/configs/zynq_zc702_RSA_defconfig
@@ -12,4 +12,5 @@ CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
index 2383ab686b185f97bb692f051fe322c270478ef6..15283142d14efe67231bf4bbc6b89ff042443daa 100644 (file)
--- a/configs/zynq_zc702_defconfig
+++ b/configs/zynq_zc702_defconfig
@@ -13,6 +13,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=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 e2059ed92b25bd778cf9618fdfabacf6e59733ac..401cf16dcb29e9887e978267ecf2133a3e148f37 100644 (file)
--- a/configs/zynq_zc706_RSA_defconfig
+++ b/configs/zynq_zc706_RSA_defconfig
@@ -14,4 +14,5 @@ CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index 0b8dd032090c9114719c1ccf7993686de3e3b4a5..f4d7dff2bca1a1212badecb310721aee37dbf5f0 100644 (file)
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -14,5 +14,6 @@ CONFIG_CMD_GPIO=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=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 86edcf9cb60d6005d2b913f986a1f5049a9f760a..282c4b56252c26364bb9bfd74f8dd1d897ee3d88 100644 (file)
--- a/configs/zynq_zc770_xm010_RSA_defconfig
+++ b/configs/zynq_zc770_xm010_RSA_defconfig
@@ -14,4 +14,5 @@ CONFIG_SYS_PROMPT="Zynq> "
 CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
index 9ee86c0943ac4977b65b287ba2101f49dc97f70a..1421cb6a139ad758e483dcb141fc66f421ed7bdf 100644 (file)
--- a/configs/zynq_zc770_xm010_defconfig
+++ b/configs/zynq_zc770_xm010_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_SPI=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zc770_xm013_RSA_defconfig b/configs/zynq_zc770_xm013_RSA_defconfig
index 37a99f5e41930c5df0d52d345190f3dc7ce20336..0a1313fabc56b14ac763453463441649b974883f 100644 (file)
--- a/configs/zynq_zc770_xm013_RSA_defconfig
+++ b/configs/zynq_zc770_xm013_RSA_defconfig
@@ -13,4 +13,5 @@ CONFIG_SYS_PROMPT="Zynq> "
 CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
index 7c01895a85ef7af8b876e78e965e84e72642b2d5..a37ac572eec393024f649f29509c53abf6a62a66 100644 (file)
--- a/configs/zynq_zc770_xm013_defconfig
+++ b/configs/zynq_zc770_xm013_defconfig
@@ -14,5 +14,6 @@ CONFIG_CMD_GPIO=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zed_RSA_defconfig b/configs/zynq_zed_RSA_defconfig
index f2b8e26b9db9a1710d37e03244798cac1a1c80fc..245aa07bab9ecbc9c3ff99035cfd9a48410d527d 100644 (file)
--- a/configs/zynq_zed_RSA_defconfig
+++ b/configs/zynq_zed_RSA_defconfig
@@ -13,4 +13,5 @@ CONFIG_SYS_PROMPT="Zynq> "
 CONFIG_CMD_ZYNQ_RSA=y
 CONFIG_OF_EMBED=y
 CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index 3f6b2cc0ab65c1114e1ac56aa2baa9a4ae4c0a52..3f88cd3531a40bcd703fcf12372c69d49cff6ddf 100644 (file)
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -14,5 +14,6 @@ CONFIG_CMD_GPIO=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_QSPI=y

diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index cd48fbb4199bad9d16ed81963efa71641cdf2851..0409faec9d9df049fa964f5c22e5c38ea9a61904 100644 (file)
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -14,6 +14,7 @@ CONFIG_CMD_GPIO=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=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 4651955de84b1e86e0b63020b4b19d94d402db1f..13a06342189e0118e08592cdd03e84b225d6c401 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -70,7 +70,6 @@
 # define CONFIG_SPI_FLASH_WINBOND
 # define CONFIG_SPI_FLASH_ISSI
 # define CONFIG_SPI_FLASH_MACRONIX
-# define CONFIG_SPI_FLASH_BAR
 # define CONFIG_CMD_SF
 # define CONFIG_SF_DUAL_FLASH
 #endif