From d49d943955e945ef1d62b92071382398fdc2ac83 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Fri, 7 Aug 2015 09:36:32 +0200 Subject: [PATCH] zynqmp: Move SPI_FLASH and SPI_FLASH_BAR to defconfig Move configurable options from config file to defconfig. Signed-off-by: Michal Simek --- configs/xilinx_zynqmp_ep_defconfig | 2 ++ configs/xilinx_zynqmp_mini_qspi_defconfig | 2 ++ include/configs/xilinx_zynqmp.h | 2 -- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig index ea7d6356249..19316540b24 100644 --- 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 c2e58c799b9..90d89071e37 100644 --- 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 865d706a08a..9bb37379397 100644 --- 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 -- 2.47.3