arm: zynq: Move CONFIG_SF_DUAL_FLASH to defconfig

Move the only use of CONFIG_SF_DUAL_FLASH to defconfig. This makes the
associated topic_miamiplus.h header obsolete, so remove that as well.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/README b/README
index 27a075abbb619f38efa475dceb65eaf2f3bb7082..2abba91b6475d0781e1791336f6e5a37d3966cbc 100644 (file)
--- a/README
+++ b/README
@@ -2534,12 +2534,6 @@ The following options need to be configured:
                Define this option to include a destructive SPI flash
                test ('sf test').
 
-               CONFIG_SF_DUAL_FLASH            Dual flash memories
-
-               Define this option to use dual flash support where two flash
-               memories can be connected with a given cs line.
-               Currently Xilinx Zynq qspi supports these type of connections.
-
 - SystemACE Support:
                CONFIG_SYSTEMACE
 

diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig
index 10762f84e16064cab2b8ec63aa7409793e8864bf..535ce6d500d9bcfcb7facad7ea9666bcc375004a 100644 (file)
--- a/configs/topic_miamiplus_defconfig
+++ b/configs/topic_miamiplus_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SYS_VENDOR="topic"
-CONFIG_SYS_CONFIG_NAME="topic_miamiplus"
+CONFIG_SYS_CONFIG_NAME="topic_miami"
 CONFIG_ARCH_ZYNQ=y
 CONFIG_SYS_TEXT_BASE=0x4000000
 CONFIG_BOOT_INIT_FILE="board/topic/zynq/zynq-topic-miamiplus/ps7_regs.txt"
@@ -28,6 +28,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_RAM=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
+CONFIG_SF_DUAL_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_STMICRO=y

diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig
index 5ca0a712d84a466e1a30002adf57418b80fbaee0..5700859ff27149cc1ba5d6ea99738b52200a98b3 100644 (file)
--- a/drivers/mtd/spi/Kconfig
+++ b/drivers/mtd/spi/Kconfig
@@ -42,6 +42,13 @@ config SPI_FLASH_BAR
          Bank/Extended address registers are used to access the flash
          which has size > 16MiB in 3-byte addressing.
 
+config SF_DUAL_FLASH
+       bool "SPI DUAL flash memory support"
+       depends on SPI_FLASH
+       help
+         Enable this option to support two flash memories connected to a single
+         controller. Currently Xilinx Zynq qspi supports this.
+
 if SPI_FLASH
 
 config SPI_FLASH_ATMEL

diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h
index a28922585cd8d74b08908c133a99a8ad4e7dfacc..ee46d3ac7ecfd98ef1a51f66789810cbbbad559d 100644 (file)
--- a/include/configs/topic_miami.h
+++ b/include/configs/topic_miami.h
@@ -56,7 +56,6 @@
 #undef CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_SF_DEFAULT_SPEED        108000000
 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0
-#undef CONFIG_SF_DUAL_FLASH
 #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
 #undef CONFIG_SPI_FLASH_WINBOND
 #undef CONFIG_SPI_FLASH_ISSI

diff --git a/include/configs/topic_miamiplus.h b/include/configs/topic_miamiplus.h
deleted file mode 100644 (file)
index 46ca6bd..0000000
--- a/include/configs/topic_miamiplus.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "topic_miami.h"
-#define CONFIG_SF_DUAL_FLASH

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ac7adb20f73c4abd3c82d08f6a5315b0f6b71481..feb430f7457ff00ec648bb41a7b21f1123b88592 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2284,7 +2284,6 @@ CONFIG_SF_DEFAULT_BUS
 CONFIG_SF_DEFAULT_CS
 CONFIG_SF_DEFAULT_MODE
 CONFIG_SF_DEFAULT_SPEED
-CONFIG_SF_DUAL_FLASH
 CONFIG_SGI_IP28
 CONFIG_SH4_PCI
 CONFIG_SH73A0