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 <[email protected]> Signed-off-by: Michal Simek <[email protected]>
rck2015 · Aug 14, 2015 · db0d4f8 · db0d4f8
1 parent de0cb87
commit db0d4f8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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