From 9f67dc8d8b61c87c8a2ffd502827bd0c9a74b79f Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 12 Jan 2016 13:44:29 +0100 Subject: [PATCH] ARM: zynq: Move FLASH_BAR to Kconfig Clean up config and use Kconfig more. Signed-off-by: Michal Simek --- configs/zynq_afx_qspi_RSA_defconfig | 1 + configs/zynq_afx_qspi_defconfig | 1 + configs/zynq_cc108_defconfig | 1 + configs/zynq_cse_qspi_defconfig | 1 + configs/zynq_microzed_defconfig | 1 + configs/zynq_zc702_RSA_defconfig | 1 + configs/zynq_zc702_defconfig | 1 + configs/zynq_zc706_RSA_defconfig | 1 + configs/zynq_zc706_defconfig | 1 + configs/zynq_zc770_xm010_RSA_defconfig | 1 + configs/zynq_zc770_xm010_defconfig | 1 + configs/zynq_zc770_xm013_RSA_defconfig | 1 + configs/zynq_zc770_xm013_defconfig | 1 + configs/zynq_zed_RSA_defconfig | 1 + configs/zynq_zed_defconfig | 1 + configs/zynq_zybo_defconfig | 1 + include/configs/zynq-common.h | 1 - 17 files changed, 16 insertions(+), 1 deletion(-) diff --git a/configs/zynq_afx_qspi_RSA_defconfig b/configs/zynq_afx_qspi_RSA_defconfig index 16b392a20d7..65d59abad22 100644 --- 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 8e8b375e85a..8edc4ef8ec2 100644 --- 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 e9ed330d8d8..0c30d8795c3 100644 --- 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 d30341add4c..9dfd8bc0abb 100644 --- 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 a255d46d94f..7b71d79b796 100644 --- 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 b313dbbe98d..862fd220e28 100644 --- 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 2383ab686b1..15283142d14 100644 --- 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 e2059ed92b2..401cf16dcb2 100644 --- 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 0b8dd032090..f4d7dff2bca 100644 --- 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 86edcf9cb60..282c4b56252 100644 --- 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 9ee86c0943a..1421cb6a139 100644 --- 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 37a99f5e419..0a1313fabc5 100644 --- 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 7c01895a85e..a37ac572eec 100644 --- 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 f2b8e26b9db..245aa07bab9 100644 --- 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 3f6b2cc0ab6..3f88cd3531a 100644 --- 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 cd48fbb4199..0409faec9d9 100644 --- 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 4651955de84..13a06342189 100644 --- 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 -- 2.47.3