arm: mvebu: Fix default CONFIG_BUILD_TARGET

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>

diff --git a/Kconfig b/Kconfig
index d29519c18bdcd64b02e651e768b5b2f5d6d256c2..b5111cdb08719c3a4d520db4f2155a9409b1a043 100644 (file)
--- 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