From db0d4f8a7f75e3daccbcfe09b7a798f183d29c83 Mon Sep 17 00:00:00 2001 From: Siva Durga Prasad Paladugu Date: Fri, 14 Aug 2015 14:28:58 +0530 Subject: [PATCH] zynq-common: Fix redefinition error with configs CMD_SF and CMD_SPI Define CMD_SF and CMD_SPI configs incase of either the ZYNQ_SPI or ZYNQ_QSPI or both. This is to avoid the redefinition error if both ZYNQ_SPI and ZYNQ_QSPI are enabled. Signed-off-by: Siva Durga Prasad Paladugu Signed-off-by: Michal Simek --- include/configs/zynq-common.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 3a7bfd32c60..6eaa8f58f03 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -75,6 +75,9 @@ /* SPI */ #ifdef CONFIG_ZYNQ_SPI # define CONFIG_SPI_FLASH_SST +#endif + +#if defined(CONFIG_ZYNQ_SPI) || defined(CONFIG_ZYNQ_QSPI) # define CONFIG_CMD_SPI # define CONFIG_CMD_SF #endif @@ -184,8 +187,6 @@ # define CONFIG_SPI_FLASH_STMICRO # define CONFIG_SPI_FLASH_WINBOND # define CONFIG_SPI_FLASH_ISSI -# define CONFIG_CMD_SPI -# define CONFIG_CMD_SF # define CONFIG_SF_DUAL_FLASH #endif -- 2.47.3