From: Michal Simek <michal.simek@xilinx.com>
Date: Fri, 18 Mar 2016 16:57:57 +0000 (+0100)
Subject: ARM64: zynqmp: Move CONFIG_SPI_FLASH_SST from board file to defconfig
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82ffa200bb2741fee9a6c846b632a4ffd7dad41b;p=thirdparty%2Fu-boot.git

ARM64: zynqmp: Move CONFIG_SPI_FLASH_SST from board file to defconfig

Simplify board configuration.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
index c9b30e0ef46..dd317841da5 100644
--- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
+++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
@@ -23,6 +23,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
+CONFIG_SPI_FLASH_SST=y
 CONFIG_DM_ETH=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_SPI=y
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 73d514c1904..d3c3b2626dc 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -88,7 +88,6 @@
 
 /* SPI */
 #ifdef CONFIG_ZYNQ_SPI
-# define CONFIG_SPI_FLASH_SST
 # define CONFIG_CMD_SPI
 # define CONFIG_CMD_SF
 #endif