arm: mvebu: Fix default CONFIG_BUILD_TARGET
PATCH 1/3 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.
--- Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Kconfig +2 -2
@@ -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
Signature · 1 line
2.20.1
PATCH 2/3 powerpc/mpc85xx: Set default CONFIG_BUILD_TARGET
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.
--- Kconfig | 1 + 1 file changed, 1 insertion(+)
Kconfig +1 -0
@@ -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
Signature · 1 line
2.20.1
Re: [PATCH 2/3] powerpc/mpc85xx: Set default CONFIG_BUILD_TARGET
Quoted 7 lines · Pali Rohár
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_E500is set not only for e500 cores, but also for all other mpc85xx cores e500mc, e5500 and e5600. So do not useCONFIG_E500and instead filter new cores with PBL based bootrom.Signed-off-by Pali Rohár <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 3/3 powerpc/mpc85xx: Unset CONFIG_SPL_TARGET="u-boot-with-spl.bin"
In reply to Pali RohárCONFIG_SPL_TARGET should specify additional SPL make target. But u-boot-with-spl.bin is final U-Boot binary, not SPL binary in some custom format. Moreover u-boot-with-spl.bin is already set in CONFIG_BUILD_TARGET, so make will build it by default.
--- configs/P1010RDB-PA_36BIT_NAND_defconfig | 1 - configs/P1010RDB-PA_36BIT_SDCARD_defconfig | 1 - configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig | 1 - configs/P1010RDB-PA_NAND_defconfig | 1 - configs/P1010RDB-PA_SDCARD_defconfig | 1 - configs/P1010RDB-PA_SPIFLASH_defconfig | 1 - configs/P1010RDB-PB_36BIT_NAND_defconfig | 1 - configs/P1010RDB-PB_36BIT_SDCARD_defconfig | 1 - configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig | 1 - configs/P1010RDB-PB_NAND_defconfig | 1 - configs/P1010RDB-PB_SDCARD_defconfig | 1 - configs/P1010RDB-PB_SPIFLASH_defconfig | 1 - configs/P1020RDB-PC_36BIT_NAND_defconfig | 1 - configs/P1020RDB-PC_36BIT_SDCARD_defconfig | 1 - configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig | 1 - configs/P1020RDB-PC_NAND_defconfig | 1 - configs/P1020RDB-PC_SDCARD_defconfig | 1 - configs/P1020RDB-PC_SPIFLASH_defconfig | 1 - configs/P1020RDB-PD_NAND_defconfig | 1 - configs/P1020RDB-PD_SDCARD_defconfig | 1 - configs/P1020RDB-PD_SPIFLASH_defconfig | 1 - configs/P2020RDB-PC_36BIT_NAND_defconfig | 1 - configs/P2020RDB-PC_36BIT_SDCARD_defconfig | 1 - configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig | 1 - configs/P2020RDB-PC_NAND_defconfig | 1 - configs/P2020RDB-PC_SDCARD_defconfig | 1 - configs/P2020RDB-PC_SPIFLASH_defconfig | 1 - 27 files changed, 27 deletions(-)
configs/P1010RDB-PA_36BIT_NAND_defconfig +0 -1
@@ -49,7 +49,6 @@ CONFIG_TPL_RELOC_MALLOC=y CONFIG_TPL_RELOC_MALLOC_ADDR=0xd0034000 CONFIG_TPL_RELOC_MALLOC_SIZE=0xc000 CONFIG_SPL_NAND_SUPPORT=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_TPL=y CONFIG_TPL_DRIVERS_MISC=y CONFIG_TPL_ENV_SUPPORT=y
configs/P1010RDB-PA_36BIT_SDCARD_defconfig +0 -1
@@ -46,7 +46,6 @@ CONFIG_SPL_RELOC_MALLOC_SIZE=0x20000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_HUSH_PARSER=y CONFIG_SYS_PBSIZE=276 CONFIG_CMD_IMLS=y
configs/P1010RDB-PA_36BIT_SPIFLASH_defconfig +0 -1
@@ -48,7 +48,6 @@ CONFIG_SPL_RELOC_MALLOC_SIZE=0x20000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_HUSH_PARSER=y CONFIG_SYS_PBSIZE=276 CONFIG_CMD_IMLS=y
configs/P1010RDB-PA_NAND_defconfig +0 -1
@@ -48,7 +48,6 @@ CONFIG_TPL_RELOC_MALLOC=y CONFIG_TPL_RELOC_MALLOC_ADDR=0xd0034000 CONFIG_TPL_RELOC_MALLOC_SIZE=0xc000 CONFIG_SPL_NAND_SUPPORT=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_TPL=y CONFIG_TPL_DRIVERS_MISC=y CONFIG_TPL_ENV_SUPPORT=y
configs/P1010RDB-PA_SDCARD_defconfig +0 -1
@@ -45,7 +45,6 @@ CONFIG_SPL_RELOC_MALLOC_SIZE=0x20000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_HUSH_PARSER=y CONFIG_SYS_PBSIZE=276 CONFIG_CMD_IMLS=y
configs/P1010RDB-PA_SPIFLASH_defconfig +0 -1
@@ -47,7 +47,6 @@ CONFIG_SPL_RELOC_MALLOC_SIZE=0x20000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_HUSH_PARSER=y CONFIG_SYS_PBSIZE=276 CONFIG_CMD_IMLS=y
configs/P1010RDB-PB_36BIT_NAND_defconfig +0 -1
@@ -50,7 +50,6 @@ CONFIG_TPL_RELOC_MALLOC=y CONFIG_TPL_RELOC_MALLOC_ADDR=0xd0034000 CONFIG_TPL_RELOC_MALLOC_SIZE=0xc000 CONFIG_SPL_NAND_SUPPORT=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_TPL=y CONFIG_TPL_DRIVERS_MISC=y CONFIG_TPL_ENV_SUPPORT=y
configs/P1010RDB-PB_36BIT_SDCARD_defconfig +0 -1
@@ -47,7 +47,6 @@ CONFIG_SPL_RELOC_MALLOC_SIZE=0x20000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_HUSH_PARSER=y CONFIG_SYS_PBSIZE=276 CONFIG_CMD_IMLS=y
configs/P1010RDB-PB_36BIT_SPIFLASH_defconfig +0 -1
@@ -49,7 +49,6 @@ CONFIG_SPL_RELOC_MALLOC_SIZE=0x20000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_HUSH_PARSER=y CONFIG_SYS_PBSIZE=276 CONFIG_CMD_IMLS=y
configs/P1010RDB-PB_NAND_defconfig +0 -1
@@ -49,7 +49,6 @@ CONFIG_TPL_RELOC_MALLOC=y CONFIG_TPL_RELOC_MALLOC_ADDR=0xd0034000 CONFIG_TPL_RELOC_MALLOC_SIZE=0xc000 CONFIG_SPL_NAND_SUPPORT=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_TPL=y CONFIG_TPL_DRIVERS_MISC=y CONFIG_TPL_ENV_SUPPORT=y
configs/P1010RDB-PB_SDCARD_defconfig +0 -1
@@ -46,7 +46,6 @@ CONFIG_SPL_RELOC_MALLOC_SIZE=0x20000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_HUSH_PARSER=y CONFIG_SYS_PBSIZE=276 CONFIG_CMD_IMLS=y
configs/P1010RDB-PB_SPIFLASH_defconfig +0 -1
@@ -48,7 +48,6 @@ CONFIG_SPL_RELOC_MALLOC_SIZE=0x20000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_HUSH_PARSER=y CONFIG_SYS_PBSIZE=276 CONFIG_CMD_IMLS=y
configs/P1020RDB-PC_36BIT_NAND_defconfig +0 -1
@@ -50,7 +50,6 @@ CONFIG_TPL_RELOC_MALLOC=y CONFIG_TPL_RELOC_MALLOC_ADDR=0xf8fb4000 CONFIG_TPL_RELOC_MALLOC_SIZE=0xc000 CONFIG_SPL_NAND_SUPPORT=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_TPL=y CONFIG_TPL_ENV_SUPPORT=y CONFIG_TPL_I2C=y
configs/P1020RDB-PC_36BIT_SDCARD_defconfig +0 -1
@@ -47,7 +47,6 @@ CONFIG_SPL_RELOC_MALLOC_SIZE=0x1b000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PBSIZE=276
configs/P1020RDB-PC_36BIT_SPIFLASH_defconfig +0 -1
@@ -49,7 +49,6 @@ CONFIG_SPL_RELOC_MALLOC_SIZE=0x1b000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PBSIZE=276
configs/P1020RDB-PC_NAND_defconfig +0 -1
@@ -49,7 +49,6 @@ CONFIG_TPL_RELOC_MALLOC=y CONFIG_TPL_RELOC_MALLOC_ADDR=0xf8fb4000 CONFIG_TPL_RELOC_MALLOC_SIZE=0xc000 CONFIG_SPL_NAND_SUPPORT=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_TPL=y CONFIG_TPL_ENV_SUPPORT=y CONFIG_TPL_I2C=y
configs/P1020RDB-PC_SDCARD_defconfig +0 -1
@@ -46,7 +46,6 @@ CONFIG_SPL_RELOC_MALLOC_SIZE=0x1b000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PBSIZE=276
configs/P1020RDB-PC_SPIFLASH_defconfig +0 -1
@@ -48,7 +48,6 @@ CONFIG_SPL_RELOC_MALLOC_SIZE=0x1b000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PBSIZE=276
configs/P1020RDB-PD_NAND_defconfig +0 -1
@@ -49,7 +49,6 @@ CONFIG_TPL_RELOC_MALLOC=y CONFIG_TPL_RELOC_MALLOC_ADDR=0xf8fb4000 CONFIG_TPL_RELOC_MALLOC_SIZE=0xc000 CONFIG_SPL_NAND_SUPPORT=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_TPL=y CONFIG_TPL_ENV_SUPPORT=y CONFIG_TPL_I2C=y
configs/P1020RDB-PD_SDCARD_defconfig +0 -1
@@ -46,7 +46,6 @@ CONFIG_SPL_RELOC_MALLOC_SIZE=0x1b000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PBSIZE=276
configs/P1020RDB-PD_SPIFLASH_defconfig +0 -1
@@ -48,7 +48,6 @@ CONFIG_SPL_RELOC_MALLOC_SIZE=0x1b000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PBSIZE=276
configs/P2020RDB-PC_36BIT_NAND_defconfig +0 -1
@@ -50,7 +50,6 @@ CONFIG_TPL_RELOC_MALLOC=y CONFIG_TPL_RELOC_MALLOC_ADDR=0xf8fb4000 CONFIG_TPL_RELOC_MALLOC_SIZE=0xc000 CONFIG_SPL_NAND_SUPPORT=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_TPL=y CONFIG_TPL_ENV_SUPPORT=y CONFIG_TPL_I2C=y
configs/P2020RDB-PC_36BIT_SDCARD_defconfig +0 -1
@@ -47,7 +47,6 @@ CONFIG_SPL_RELOC_MALLOC_SIZE=0x5b000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PBSIZE=276
configs/P2020RDB-PC_36BIT_SPIFLASH_defconfig +0 -1
@@ -49,7 +49,6 @@ CONFIG_SPL_RELOC_MALLOC_SIZE=0x5b000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PBSIZE=276
configs/P2020RDB-PC_NAND_defconfig +0 -1
@@ -49,7 +49,6 @@ CONFIG_TPL_RELOC_MALLOC=y CONFIG_TPL_RELOC_MALLOC_ADDR=0xf8fb4000 CONFIG_TPL_RELOC_MALLOC_SIZE=0xc000 CONFIG_SPL_NAND_SUPPORT=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_TPL=y CONFIG_TPL_ENV_SUPPORT=y CONFIG_TPL_I2C=y
configs/P2020RDB-PC_SDCARD_defconfig +0 -1
@@ -46,7 +46,6 @@ CONFIG_SPL_RELOC_MALLOC_SIZE=0x5b000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PBSIZE=276
configs/P2020RDB-PC_SPIFLASH_defconfig +0 -1
@@ -48,7 +48,6 @@ CONFIG_SPL_RELOC_MALLOC_SIZE=0x5b000 CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C=y CONFIG_SPL_MPC8XXX_INIT_DDR=y -CONFIG_SPL_TARGET="u-boot-with-spl.bin" CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PBSIZE=276
Signature · 1 line
2.20.1
Re: [PATCH 3/3] powerpc/mpc85xx: Unset CONFIG_SPL_TARGET="u-boot-with-spl.bin"
Quoted 6 lines · Pali Rohár
CONFIG_SPL_TARGETshould specify additional SPL make target. But u-boot-with-spl.bin is final U-Boot binary, not SPL binary in some custom format. Moreover u-boot-with-spl.bin is already set inCONFIG_BUILD_TARGET, so make will build it by default.Signed-off-by Pali Rohár <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Quoted 10 lines · Pali Rohár
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_MVEBUbyCONFIG_ARMADA_32BIT(it impliesCONFIG_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 <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom