summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2020-05-26 15:06:15 -0400
committerTom Rini <[email protected]>2020-06-04 18:10:02 -0400
commit31f39b2f46a4ab49a38179e59dd7c468065e43e3 (patch)
tree13b5f053661a47525caa332568f13891ab7a931f
parent559c99f62818749c77f9078af929b214a0a7f819 (diff)
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 <[email protected]> Cc: Masakazu Mochizuki <[email protected]> Signed-off-by: Tom Rini <[email protected]>
-rw-r--r--configs/blanche_defconfig2
-rw-r--r--include/configs/blanche.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig
index 137acceea07..641b7790233 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 fd29c5d0f1e..f048f158ed2 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 */