On Wednesday 17 August 2022 23:00:43 Pali Rohár wrote:
On Wednesday 17 August 2022 12:05:20 Stefan Roese wrote:
On 17.08.22 11:59, Pali Rohár wrote:
File name with pattern u-boot-spl* is used on all places except in kwb image for binary with SPL-only code. Combined binary with both SPL and proper U-Boot in other places has file name pattern u-boot-with-spl*.
Make it consistent also for kwb image and rename u-boot-spl.kwb to u-boot-with-spl.kwb as this image contains both SPL and proper U-Boot code.
Signed-off-by: Pali Rohár pali@kernel.org
This is just RFC patch, please let me know what do you think.
Frankly, I wondered a few days ago if this image only includes the SPL image. So this change makes total sense to me. It might break some out-of-tree building scripts, but I think we should go forward this way:
Reviewed-by: Stefan Roese sr@denx.de
Ok! If you like it, feel free to take it. First time I was also confused and having consistent naming could help other people too...
Btw, there is similar "rename" patch for u-boot-with-dtb.bin target: https://patchwork.ozlabs.org/project/uboot/patch/20220801154220.20068-2-pali...
Thanks, Stefan
Kconfig | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Kconfig b/Kconfig index 991b260182e8..5c64ca843eed 100644 --- a/Kconfig +++ b/Kconfig @@ -455,7 +455,7 @@ 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-spl.kwb" if ARCH_MVEBU && SPL
- default "u-boot-with-spl.kwb" if ARCH_MVEBU && 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)
diff --git a/Makefile b/Makefile index 1a66f69a4b14..b1fbdbe7d726 100644 --- a/Makefile +++ b/Makefile @@ -1432,7 +1432,7 @@ KWD_CONFIG_FILE = $(shell \ MKIMAGEFLAGS_u-boot.kwb = -n $(KWD_CONFIG_FILE) \ -T kwbimage -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -MKIMAGEFLAGS_u-boot-spl.kwb = -n $(KWD_CONFIG_FILE) \ +MKIMAGEFLAGS_u-boot-with-spl.kwb = -n $(KWD_CONFIG_FILE) \ -T kwbimage -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) \ $(if $(KEYDIR),-k $(KEYDIR)) @@ -1477,7 +1477,7 @@ u-boot.itb: u-boot-nodtb.bin \ $(BOARD_SIZE_CHECK) endif -u-boot-spl.kwb: u-boot.bin spl/u-boot-spl.bin FORCE +u-boot-with-spl.kwb: u-boot.bin spl/u-boot-spl.bin FORCE $(call if_changed,mkimage) u-boot.sha1: u-boot.bin
Viele Grüße, Stefan Roese
-- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de