zynqmp: Move SPI_FLASH and SPI_FLASH_BAR to defconfig

Move configurable options from config file to defconfig.

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

diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig
index ea7d63562494c903f76a3aa1e99de20f68344dca..19316540b24ed1d6c13c61eff72b8f157c450c61 100644 (file)
--- a/configs/xilinx_zynqmp_ep_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -15,3 +15,5 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y
 CONFIG_OF_EMBED=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y

diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig
index c2e58c799b90b2d7810d45bf4543c92ac309c07c..90d89071e375ce5371538493e2afd896981b5f78 100644 (file)
--- a/configs/xilinx_zynqmp_mini_qspi_defconfig
+++ b/configs/xilinx_zynqmp_mini_qspi_defconfig
@@ -10,3 +10,5 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_SYS_EXTRA_OPTIONS="MINI_QSPI"
 # CONFIG_CMD_IMLS is not set
 CONFIG_OF_EMBED=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 865d706a08ab7219468001c0167849f3f323e529..9bb373793977876cfafe7a5261772240cddfa3d0 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -101,8 +101,6 @@
 #ifdef CONFIG_ZYNQMP_QSPI
 # define CONFIG_SPI_GENERIC
 # define CONFIG_SF_DEFAULT_SPEED       30000000
-# define CONFIG_SPI_FLASH
-# define CONFIG_SPI_FLASH_BAR
 # define CONFIG_SF_DUAL_FLASH
 # define CONFIG_SPI_FLASH_SPANSION
 # define CONFIG_SPI_FLASH_STMICRO