aboutsummaryrefslogtreecommitdiff
path: root/Kconfig
diff options
context:
space:
mode:
authorPali Rohár <pali@kernel.org>2022-12-29 02:39:19 +0100
committerTom Rini <trini@konsulko.com>2023-01-10 15:39:07 -0500
commitf0b1a1e13e17fe1f1d9d15e256cd89ac2c17c289 (patch)
treed192e9da51615bba2d95120889b90834deaa9cea /Kconfig
parent971ccee2fb74a5dad282e230d60de84e1fb6e6dd (diff)
downloadu-boot-f0b1a1e13e17fe1f1d9d15e256cd89ac2c17c289.zip
u-boot-f0b1a1e13e17fe1f1d9d15e256cd89ac2c17c289.tar.gz
u-boot-f0b1a1e13e17fe1f1d9d15e256cd89ac2c17c289.tar.bz2
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>
Diffstat (limited to 'Kconfig')
-rw-r--r--Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/Kconfig b/Kconfig
index d29519c..b5111cd 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