diff mbox series

[2/3] powerpc/mpc85xx: Set default CONFIG_BUILD_TARGET

Message ID 20221229013921.24930-2-pali@kernel.org
State Accepted
Commit e0025d995788b8d5bdd079659a7d6cd60858442f
Delegated to: Tom Rini
Headers show
Series [1/3] arm: mvebu: Fix default CONFIG_BUILD_TARGET | expand

Commit Message

Pali Rohár Dec. 29, 2022, 1:39 a.m. UTC
Final U-Boot binary for mpc85xx boards which use SPL and are not PBL-based
based is u-boot-with-spl.bin. PBL is not used only on boards with e500v1
and e500v2 cores. Apparently CONFIG_E500 is set not only for e500 cores,
but also for all other mpc85xx cores e500mc, e5500 and e5600. So do not use
CONFIG_E500 and instead filter new cores with PBL based bootrom.

Signed-off-by: Pali Rohár <pali@kernel.org>
---
 Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Tom Rini Jan. 11, 2023, 2:17 a.m. UTC | #1
On Thu, Dec 29, 2022 at 02:39:20AM +0100, Pali Rohár wrote:

> Final U-Boot binary for mpc85xx boards which use SPL and are not PBL-based
> based is u-boot-with-spl.bin. PBL is not used only on boards with e500v1
> and e500v2 cores. Apparently CONFIG_E500 is set not only for e500 cores,
> but also for all other mpc85xx cores e500mc, e5500 and e5600. So do not use
> CONFIG_E500 and instead filter new cores with PBL based bootrom.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>

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

Patch

diff --git a/Kconfig b/Kconfig
index 2243cc51c7cb..dedac5396918 100644
--- a/Kconfig
+++ b/Kconfig
@@ -461,6 +461,7 @@  config BUILD_TARGET
 	default "u-boot.itb" if !BINMAN && SPL_LOAD_FIT && (ARCH_ROCKCHIP || \
 				ARCH_SUNXI || RISCV || ARCH_ZYNQMP)
 	default "u-boot.kwb" if (ARCH_KIRKWOOD || ARMADA_32BIT) && !SPL
+	default "u-boot-with-spl.bin" if MPC85xx && !E500MC && !E5500 && !E6500 && SPL
 	default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
 	default "u-boot-with-spl.imx" if ARCH_MX6 && SPL
 	help