From: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Date: Fri, 14 Aug 2015 08:58:58 +0000 (+0530)
Subject: zynq-common: Fix redefinition error with configs CMD_SF and CMD_SPI
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db0d4f8a7f75e3daccbcfe09b7a798f183d29c83;p=thirdparty%2Fu-boot.git

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 <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

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