From patchwork Tue May 26 19:06:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 246629 List-Id: U-Boot discussion From: trini at konsulko.com (Tom Rini) Date: Tue, 26 May 2020 15:06:15 -0400 Subject: [PATCH 4/8] blance: Disable CONFIG_CMD_SF / CONFIG_CMD_SPI In-Reply-To: <20200526190619.29583-1-trini@konsulko.com> References: <20200526190619.29583-1-trini@konsulko.com> Message-ID: <20200526190619.29583-4-trini@konsulko.com> 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 Cc: Masakazu Mochizuki Signed-off-by: Tom Rini --- This is a case where it's hard to tell if this is the correct fix or if both should be enabled instead. --- configs/blanche_defconfig | 2 +- include/configs/blanche.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig index 137acceea071..641b7790233b 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 fd29c5d0f1ed..f048f158ed2a 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 */