From 89900dfaecbe13db0040e65bfb53af28a0512b91 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 13 Jan 2016 14:08:06 +0100 Subject: [PATCH] ARM: zynq: Move ZYNQ_QSPI to Kconfig And clean appropriate config headers. Signed-off-by: Michal Simek --- configs/zynq_afx_qspi_RSA_defconfig | 2 +- configs/zynq_afx_qspi_defconfig | 2 +- configs/zynq_cc108_defconfig | 1 + configs/zynq_cse_qspi_defconfig | 1 + configs/zynq_zc770_xm013_RSA_defconfig | 2 +- configs/zynq_zc770_xm013_defconfig | 2 +- include/configs/zynq_afx.h | 2 -- include/configs/zynq_cc108.h | 1 - include/configs/zynq_cse.h | 5 +---- include/configs/zynq_zc770.h | 3 --- 10 files changed, 7 insertions(+), 14 deletions(-) diff --git a/configs/zynq_afx_qspi_RSA_defconfig b/configs/zynq_afx_qspi_RSA_defconfig index 9ca1bd17847..16b392a20d7 100644 --- 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 6622722489c..8e8b375e85a 100644 --- 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 74c446b9aa3..e9ed330d8d8 100644 --- 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 75a970ab096..d30341add4c 100644 --- 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 3ab24f8862e..37a99f5e419 100644 --- 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 8cf58420e8a..7c01895a85e 100644 --- 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 dd211135699..59631e40dfb 100644 --- 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 f5326e37eef..a9f7eca35b4 100644 --- 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 diff --git a/include/configs/zynq_cse.h b/include/configs/zynq_cse.h index fbe034c8925..b83ca92a6b4 100644 --- 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 03e620dc7af..3d7306428b6 100644 --- 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 -- 2.47.3