[U-Boot] [PATCH] Move CONFIG_SF_DUAL_FLASH to defconfig
Mike Looijmans
mike.looijmans at topic.nl
Thu Jun 1 08:42:58 UTC 2017
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 at topic.nl>
---
configs/topic_miamiplus_defconfig | 3 ++-
include/configs/topic_miamiplus.h | 2 --
scripts/config_whitelist.txt | 1 -
3 files changed, 2 insertions(+), 4 deletions(-)
delete mode 100644 include/configs/topic_miamiplus.h
diff --git a/configs/topic_miamiplus_defconfig b/configs/topic_miamiplus_defconfig
index 10762f8..535ce6d 100644
--- 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/include/configs/topic_miamiplus.h b/include/configs/topic_miamiplus.h
deleted file mode 100644
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 e8f49eb..642c433 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2401,7 +2401,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
--
1.9.1
More information about the U-Boot
mailing list