diff mbox series

[4/8] blance: Disable CONFIG_CMD_SF / CONFIG_CMD_SPI

Message ID 20200526190619.29583-4-trini@konsulko.com
State New
Headers show
Series [1/8] pfla02: Rework excluding NAND from SPL | expand

Commit Message

Tom Rini May 26, 2020, 7:06 p.m. UTC
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 at gmail.com>
Cc: Masakazu Mochizuki <masakazu.mochizuki.wd at hitachi.com>
Signed-off-by: Tom Rini <trini at konsulko.com>
---
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(-)

Comments

Marek Vasut May 26, 2020, 7:21 p.m. UTC | #1
On 5/26/20 9:06 PM, Tom Rini wrote:
> 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 at gmail.com>
> Cc: Masakazu Mochizuki <masakazu.mochizuki.wd at hitachi.com>
> Signed-off-by: Tom Rini <trini at konsulko.com>
> ---
> This is a case where it's hard to tell if this is the correct fix or if
> both should be enabled instead.

Blanche (with H) is booting from parallel NOR, it's unique that way.
So this is a correct fix.

The tags should be ARM: rmobile: blanche: . Also CC Iwamatsu-san.
Tom Rini May 26, 2020, 7:26 p.m. UTC | #2
On Tue, May 26, 2020 at 09:21:59PM +0200, Marek Vasut wrote:
> On 5/26/20 9:06 PM, Tom Rini wrote:
> > 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 at gmail.com>
> > Cc: Masakazu Mochizuki <masakazu.mochizuki.wd at hitachi.com>
> > Signed-off-by: Tom Rini <trini at konsulko.com>
> > ---
> > This is a case where it's hard to tell if this is the correct fix or if
> > both should be enabled instead.
> 
> Blanche (with H) is booting from parallel NOR, it's unique that way.
> So this is a correct fix.

I typo'd that a half dozen times, oops.

> The tags should be ARM: rmobile: blanche: . Also CC Iwamatsu-san.

Do you want to fixup the tag or should I when applying?  Thanks.
Marek Vasut May 26, 2020, 8:44 p.m. UTC | #3
On 5/26/20 9:26 PM, Tom Rini wrote:
> On Tue, May 26, 2020 at 09:21:59PM +0200, Marek Vasut wrote:
>> On 5/26/20 9:06 PM, Tom Rini wrote:
>>> 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 at gmail.com>
>>> Cc: Masakazu Mochizuki <masakazu.mochizuki.wd at hitachi.com>
>>> Signed-off-by: Tom Rini <trini at konsulko.com>
>>> ---
>>> This is a case where it's hard to tell if this is the correct fix or if
>>> both should be enabled instead.
>>
>> Blanche (with H) is booting from parallel NOR, it's unique that way.
>> So this is a correct fix.
> 
> I typo'd that a half dozen times, oops.
> 
>> The tags should be ARM: rmobile: blanche: . Also CC Iwamatsu-san.
> 
> Do you want to fixup the tag or should I when applying?  Thanks.

Fix it up when applying.
diff mbox series

Patch

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 */