diff mbox series

[1/1] arm: mediatek: remove unused binman config

Message ID 1583323428-22451-2-git-send-email-sam.shih@mediatek.com
State Accepted
Commit db41d985f6bbf42f83a91b1e4a321a97d72aa843
Delegated to: Tom Rini
Headers show
Series [1/1] arm: mediatek: remove unused binman config | expand

Commit Message

Sam Shih March 4, 2020, 12:03 p.m. UTC
The binman-option BINMAN_FDT is introduced by this commit:
commit 3c10dc95bdd0 ("binman: Add a library to access binman entries")
BINMAN_FDT being selected when BINMAN=y that resulting in mt7623
and mt7622 are unable to boot. The root cause of this issue is commit:
commit cbd2fba1eca1 ("arm: MediaTek: add basic support for MT7629 boards")
select BINMAN=y in all mediatek SoCs, and others mediatek SoCs not
expect to use BINMAN_FDT.
This patch remove BINMAN=y option when ARCH_MEDIATEK=y and
move this to the specify SoCs part config.

Signed-off-by: Sam Shih <sam.shih@mediatek.com>
---
Used:
https://patchwork.ozlabs.org/patch/1242084/

Post this patch separately because it's not related to pwm

---
 arch/arm/Kconfig               | 1 -
 arch/arm/mach-mediatek/Kconfig | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

Comments

Frank Wunderlich March 7, 2020, 8:27 a.m. UTC | #1
Have tested this Patch, fixes the binman-issue on bpi-r2/bpi-r64

Tested-by: Frank Wunderlich <frank-w@public-files.de>

@tom can you merge this until next rc?

regards Frank
Tom Rini March 10, 2020, 9:10 p.m. UTC | #2
On Wed, Mar 04, 2020 at 08:03:48PM +0800, Sam Shih wrote:

> The binman-option BINMAN_FDT is introduced by this commit:
> commit 3c10dc95bdd0 ("binman: Add a library to access binman entries")
> BINMAN_FDT being selected when BINMAN=y that resulting in mt7623
> and mt7622 are unable to boot. The root cause of this issue is commit:
> commit cbd2fba1eca1 ("arm: MediaTek: add basic support for MT7629 boards")
> select BINMAN=y in all mediatek SoCs, and others mediatek SoCs not
> expect to use BINMAN_FDT.
> This patch remove BINMAN=y option when ARCH_MEDIATEK=y and
> move this to the specify SoCs part config.
> 
> Signed-off-by: Sam Shih <sam.shih@mediatek.com>
> Tested-by: Frank Wunderlich <frank-w@public-files.de>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8d9f7fcce7..9ca3d90aa2 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -778,7 +778,6 @@  config ARCH_MESON
 
 config ARCH_MEDIATEK
 	bool "MediaTek SoCs"
-	select BINMAN
 	select DM
 	select OF_CONTROL
 	select SPL_DM if SPL
diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig
index 17b84db5a8..0042e57017 100644
--- a/arch/arm/mach-mediatek/Kconfig
+++ b/arch/arm/mach-mediatek/Kconfig
@@ -36,6 +36,7 @@  config TARGET_MT7629
 	bool "MediaTek MT7629 SoC"
 	select CPU_V7A
 	select SPL
+	select BINMAN
 	help
 	  The MediaTek MT7629 is a ARM-based SoC with a dual-core Cortex-A7
 	  including DDR3, crypto engine, 3x3 11n/ac Wi-Fi, Gigabit Ethernet,