| Message ID | 20221229013921.24930-1-pali@kernel.org |
|---|---|
| State | Accepted |
| Commit | f0b1a1e13e17fe1f1d9d15e256cd89ac2c17c289 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/3] arm: mvebu: Fix default CONFIG_BUILD_TARGET | expand |
On Thu, Dec 29, 2022 at 02:39:19AM +0100, Pali Rohár wrote: > u-boot-with-spl.kwb is built only for SPL enabled 32-bit armada boards. > u-boot.kwb is built for 32-bit armada and kirkwood boards but only for > non-SPL targets. > > So replace CONFIG_ARCH_MVEBU by CONFIG_ARMADA_32BIT (it implies > CONFIG_ARCH_MVEBU) for u-boot-with-spl.kwb. > > And add additional CONFIG_ARMADA_32BIT && !CONFIG_SPL for u-boot.kwb. > > Signed-off-by: Pali Rohár <pali@kernel.org> Applied to u-boot/master, thanks!
diff --git a/Kconfig b/Kconfig index 0cdc9658f796..2243cc51c7cb 100644 --- a/Kconfig +++ b/Kconfig @@ -456,11 +456,11 @@ config BUILD_TARGET string "Build target special images" default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_ARRIA10 default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5 - default "u-boot-with-spl.kwb" if ARCH_MVEBU && SPL + default "u-boot-with-spl.kwb" if ARMADA_32BIT && SPL default "u-boot-elf.srec" if RCAR_GEN3 default "u-boot.itb" if !BINMAN && SPL_LOAD_FIT && (ARCH_ROCKCHIP || \ ARCH_SUNXI || RISCV || ARCH_ZYNQMP) - default "u-boot.kwb" if ARCH_KIRKWOOD + default "u-boot.kwb" if (ARCH_KIRKWOOD || ARMADA_32BIT) && !SPL default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT default "u-boot-with-spl.imx" if ARCH_MX6 && SPL help
u-boot-with-spl.kwb is built only for SPL enabled 32-bit armada boards. u-boot.kwb is built for 32-bit armada and kirkwood boards but only for non-SPL targets. So replace CONFIG_ARCH_MVEBU by CONFIG_ARMADA_32BIT (it implies CONFIG_ARCH_MVEBU) for u-boot-with-spl.kwb. And add additional CONFIG_ARMADA_32BIT && !CONFIG_SPL for u-boot.kwb. Signed-off-by: Pali Rohár <pali@kernel.org> --- Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)