From: Tom Rini <trini@konsulko.com>
Date: Tue, 26 May 2020 19:06:15 +0000 (-0400)
Subject: ARM: rmobile: blanche: Disable CONFIG_CMD_SF / CONFIG_CMD_SPI
X-Git-Tag: v2020.07-rc4~6^2~11
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=31f39b2f46a4ab49a38179e59dd7c468065e43e3;p=oweals%2Fu-boot.git

ARM: rmobile: blanche: Disable CONFIG_CMD_SF / CONFIG_CMD_SPI

The config header for this platform disables both CMD_SF and CMD_SPI and
the defconfig leaves them enabled.  Disable them from the defconfig and
enable them in the header.

Cc: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Masakazu Mochizuki <masakazu.mochizuki.wd@hitachi.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig
index 137acceea0..641b779023 100644
--- a/configs/blanche_defconfig
+++ b/configs/blanche_defconfig
@@ -24,7 +24,7 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_SDRAM=y
-CONFIG_CMD_SPI=y
+# CONFIG_CMD_SF is not set
 CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index fd29c5d0f1..f048f158ed 100644
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -42,8 +42,6 @@
 #define CONFIG_SYS_FLASH_WRITE_TOUT	3000
 #define CONFIG_SYS_FLASH_LOCK_TOUT	3000
 #define CONFIG_SYS_FLASH_UNLOCK_TOUT	3000
-#undef  CONFIG_CMD_SF
-#undef  CONFIG_CMD_SPI
 #endif
 
 /* Board Clock */