Skip to contentSkip to conversation

Makefile: Rename u-boot-spl.kwb to u-boot-with-spl.kwb

RFC PATCH In review Pali Rohár 2 participants 10 messages Aug 17, 2022 – Nov 7, 2022 Kbuild

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 Makefile: Rename u-boot-spl.kwb to u-boot-with-spl.kwb

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.

---
This is just RFC patch, please let me know what do you think.

---
 Kconfig  | 2 +-
 Makefile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Kconfig +1 -1
index 991b260182e8..5c64ca843eed 100644
@@ -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)
Makefile +2 -2
index 1a66f69a4b14..b1fbdbe7d726 100644
@@ -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
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Pali Rohár

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.

---
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:

Thanks,
Stefan

Quoted 32 lines
---
  Kconfig  | 2 +-
  Makefile | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
Kconfig +1 -1
index 991b260182e8..5c64ca843eed 100644
@@ -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)
Makefile +1 -1
index 1a66f69a4b14..b1fbdbe7d726 100644
@@ -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))
 

Makefile u-boot.itb: u-boot-nodtb.bin \ · line 1483

Quoted 8 lines
Makefile +1 -1
@@ -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

Signature · 3 lines
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: [email protected]
#2 lore raw
Quoted 12 lines · On Wednesday 17 August 2022 12:05:20 Stefan Roese wrote:
Quoted 10 lines · Pali Rohár

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.

---
This is just RFC patch, please let me know what do you think.

Quoted 6 lines

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:

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...

Quoted 47 lines

Thanks,
Stefan

Quoted 30 lines
---
  Kconfig  | 2 +-
  Makefile | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
Kconfig +1 -1
index 991b260182e8..5c64ca843eed 100644
@@ -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)
Makefile +1 -1
index 1a66f69a4b14..b1fbdbe7d726 100644
@@ -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))

Makefile u-boot.itb: u-boot-nodtb.bin \ · line 1481

Quoted 6 lines
Makefile +1 -1
@@ -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

Signature · 3 lines
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: [email protected]
#3 lore raw
Quoted 18 lines · On Wednesday 17 August 2022 23:00:43 Pali Rohár wrote:
Quoted 17 lines · On Wednesday 17 August 2022 12:05:20 Stefan Roese wrote:
Quoted 10 lines · Pali Rohár

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.

---
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:

Quoted 4 lines
Quoted 1 line

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/[email protected]/

Quoted 47 lines
Quoted 47 lines

Thanks,
Stefan

Quoted 30 lines
---
  Kconfig  | 2 +-
  Makefile | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
Kconfig +1 -1
index 991b260182e8..5c64ca843eed 100644
@@ -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)
Makefile +1 -1
index 1a66f69a4b14..b1fbdbe7d726 100644
@@ -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))

Makefile u-boot.itb: u-boot-nodtb.bin \ · line 1481

Quoted 6 lines
Makefile +1 -1
@@ -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

Signature · 3 lines
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: [email protected]
#4 lore raw
Quoted 19 lines · On Wednesday 07 September 2022 11:24:58 Pali Rohár wrote:
Quoted 18 lines · On Wednesday 17 August 2022 23:00:43 Pali Rohár wrote:
Quoted 17 lines · On Wednesday 17 August 2022 12:05:20 Stefan Roese wrote:
Quoted 10 lines · Pali Rohár

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.

---
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:

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

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/[email protected]/

Rename for u-boot-with-dtb.bin was accepted.

Quoted 47 lines
Quoted 47 lines
Quoted 47 lines

Thanks,
Stefan

Quoted 30 lines
---
  Kconfig  | 2 +-
  Makefile | 4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
Kconfig +1 -1
index 991b260182e8..5c64ca843eed 100644
@@ -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)
Makefile +1 -1
index 1a66f69a4b14..b1fbdbe7d726 100644
@@ -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))

Makefile u-boot.itb: u-boot-nodtb.bin \ · line 1481

Quoted 6 lines
Makefile +1 -1
@@ -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

Signature · 3 lines
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: [email protected]
#5 lore raw

Hi Pali,

Quoted 22 lines · Pali Rohár
Quoted 21 lines · On Wednesday 07 September 2022 11:24:58 Pali Rohár wrote:
Quoted 20 lines · On Wednesday 17 August 2022 23:00:43 Pali Rohár wrote:
Quoted 18 lines · On Wednesday 17 August 2022 12:05:20 Stefan Roese wrote:
Quoted 10 lines · Pali Rohár

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.

---
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:

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

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/[email protected]/

Rename for u-boot-with-dtb.bin was accepted.

Thanks for the notice. I'm all for adding this kwb change as well. Could you please send a non-RFC patch for this which also renames all the "u-boot-spl.kwb" occurrences in the tree?

Thanks,
Stefan

#6 lore raw

PATCH 1/1 Makefile: Rename u-boot-spl.kwb to u-boot-with-spl.kwb

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.

Also update documentation about file name changes.

---
 Kconfig                            |  2 +-
 Makefile                           |  4 ++--
 board/Marvell/db-88f6820-gp/README |  6 +++---
 board/kobol/helios4/README         |  6 +++---
 board/solidrun/clearfog/README     |  8 ++++----
 doc/README.armada-secureboot       |  4 ++--
 doc/kwboot.1                       | 12 ++++++------
 include/configs/ds414.h            |  2 +-
 8 files changed, 22 insertions(+), 22 deletions(-)
Kconfig +1 -1
index ef94f88adc28..43d4a48ac808 100644
@@ -456,7 +456,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)
Makefile +2 -2
index d5c2c9700921..eb0cc1ac060f 100644
@@ -1422,7 +1422,7 @@ KWD_CONFIG_FILE = $(shell \
 MKIMAGEFLAGS_u-boot.kwb = -n $(KWD_CONFIG_FILE) \
 	-T kwbimage -a $(CONFIG_TEXT_BASE) -e $(CONFIG_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_TEXT_BASE) -e $(CONFIG_TEXT_BASE) \
 	$(if $(KEYDIR),-k $(KEYDIR))
 
@@ -1463,7 +1463,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)
 	$(BOARD_SIZE_CHECK)
 
board/Marvell/db-88f6820-gp/README +3 -3
index 9bea5b35cb40..b4db6ed62577 100644
@@ -2,17 +2,17 @@ Update from original Marvell U-Boot to mainline U-Boot:
 -------------------------------------------------------
 
 The resulting image including the SPL binary with the
-full DDR setup is "u-boot-spl.kwb".
+full DDR setup is "u-boot-with-spl.kwb".
 
 To update the SPI NOR flash, please use the following
 command:
 
-=> sf probe;tftpboot 2000000 db-88f6820-gp/u-boot-spl.kwb;\
+=> sf probe;tftpboot 2000000 db-88f6820-gp/u-boot-with-spl.kwb;\
 sf update 2000000 0 60000
 
 Note that the original Marvell U-Boot seems to have
 problems with the "sf update" command. This does not
 work reliable. So here this command should be used:
 
-=> sf probe;tftpboot 2000000 db-88f6820-gp/u-boot-spl.kwb;\
+=> sf probe;tftpboot 2000000 db-88f6820-gp/u-boot-with-spl.kwb;\
 sf erase 0 60000;sf write 2000000 0 60000
board/kobol/helios4/README +3 -3
index 749f04827824..d615cdd2648b 100644
@@ -7,12 +7,12 @@ $ make helios4_defconfig
 $ make
 
 The resulting image including the SPL binary with the
-full DDR setup is "u-boot-spl.kwb".
+full DDR setup is "u-boot-with-spl.kwb".
 
 Now all you need to do is copy this image on a SD card.
 For example with this command:
 
-$ sudo dd if=u-boot-spl.kwb of=/dev/sdX bs=512 seek=1
+$ sudo dd if=u-boot-with-spl.kwb of=/dev/sdX bs=512 seek=1
 
 Please use the correct device node for your setup instead
 of "/dev/sdX" here!
@@ -38,7 +38,7 @@ Set the SW1 DIP switches to UART boot (see above).
 
 Run the following command to initiate U-Boot download:
 
-  ./tools/kwboot -p -b u-boot-spl.kwb /dev/ttyUSBX
+  ./tools/kwboot -p -b u-boot-with-spl.kwb /dev/ttyUSBX
 
 Use the correct UART device node for /dev/ttyUSBX.
 
board/solidrun/clearfog/README +4 -4
index 9375be84957a..ed4a712c5aa2 100644
@@ -7,12 +7,12 @@ $ make clearfog_defconfig
 $ make
 
 The resulting image including the SPL binary with the
-full DDR setup is "u-boot-spl.kwb".
+full DDR setup is "u-boot-with-spl.kwb".
 
 Now all you need to do is copy this image on a SD card.
 For example with this command:
 
-$ sudo dd if=u-boot-spl.kwb of=/dev/sdX bs=512 seek=1
+$ sudo dd if=u-boot-with-spl.kwb of=/dev/sdX bs=512 seek=1
 
 Please use the correct device node for your setup instead
 of "/dev/sdX" here!
@@ -29,7 +29,7 @@ command:
 Install U-Boot on eMMC boot partition from Linux running on Clearfog:
 
   echo 0 > /sys/block/mmcblk0boot0/force_ro
-  dd if=u-boot-spl.kwb of=/dev/mmcblk0boot0
+  dd if=u-boot-with-spl.kwb of=/dev/mmcblk0boot0
 
 Note that the SD card is not accessible when the Clearfog SOM has eMMC.
 Consider initial boot from UART (see below).
@@ -66,7 +66,7 @@ Set the SW1 DIP switches to UART boot (see above).
 
 Run the following command to initiate U-Boot download:
 
-  ./tools/kwboot -b u-boot-spl.kwb /dev/ttyUSBX
+  ./tools/kwboot -b u-boot-with-spl.kwb /dev/ttyUSBX
 
 Use the correct UART device node for /dev/ttyUSBX.
 
doc/README.armada-secureboot +2 -2
index 157cb5a231a9..4ec89d5c061f 100644
@@ -257,13 +257,13 @@ ARM architecture
 
 The creation of the boot image is done via the usual invocation of make (with a
 suitably set CROSS_COMPILE environment variable, of course). The resulting boot
-image u-boot-spl.kwb can then be tested, if so desired. The hdrparser from [5]
+image u-boot-with-spl.kwb can then be tested, if so desired. The hdrparser from [5]
 can be used for this purpose. To build the tool, invoke make in the
 'tools/marvell/doimage_mv' directory of [5], which builds a stand-alone
 hdrparser executable. A test can be conducted by calling hdrparser with the
 produced boot image and the following (mandatory) parameters:
 
-./hdrparser -k 0 -t u-boot-spl.kwb
+./hdrparser -k 0 -t u-boot-with-spl.kwb
 
 Here we assume that the CSK index is 0 and the boot image file resides in the
 same directory (adapt accordingly if needed). The tool should report that all
doc/kwboot.1 +6 -6
index 0863d197fd49..a528fbbe8c38 100644
@@ -149,25 +149,25 @@ Tested values for \fIbaudrate\fP for Armada 38x include: 115200,
 
 .SH "EXAMPLES"
 
-Instruct BootROM to enter boot Xmodem boot mode, send \fIu-boot-spl.kwb\fP
+Instruct BootROM to enter boot Xmodem boot mode, send \fIu-boot-with-spl.kwb\fP
 kwbimage file via Xmodem on \fI/dev/ttyUSB0\fP at 115200 Bd and run terminal
 program:
 .IP
-.B kwboot -b u-boot-spl.kwb -t /dev/ttyUSB0
+.B kwboot -b u-boot-with-spl.kwb -t /dev/ttyUSB0
 
 .PP
 Instruct BootROM to enter boot Xmodem boot mode, send header of
-\fIu-boot-spl.kwb\fP kwbimage file via Xmodem at 115200 Bd, then instruct
+\fIu-boot-with-spl.kwb\fP kwbimage file via Xmodem at 115200 Bd, then instruct
 BootROM to change baudrate to 5200000 Bd, send data part of the kwbimage
 file via Xmodem at high speed and finally run terminal program:
 .IP
-.B kwboot -b u-boot-spl.kwb -B 5200000 -t /dev/ttyUSB0
+.B kwboot -b u-boot-with-spl.kwb -B 5200000 -t /dev/ttyUSB0
 
 .PP
-Only send \fIu-boot-spl.kwb\fP kwbimage file via Xmodem on \fI/dev/ttyUSB0\fP
+Only send \fIu-boot-with-spl.kwb\fP kwbimage file via Xmodem on \fI/dev/ttyUSB0\fP
 at 115200 Bd:
 .IP
-.B kwboot -D u-boot-spl.kwb /dev/ttyUSB0
+.B kwboot -D u-boot-with-spl.kwb /dev/ttyUSB0
 
 .PP
 Instruct BootROM to enter console debug mode and run terminal program on
include/configs/ds414.h +1 -1
index f8273a92f11a..76d1713fdc68 100644
@@ -50,7 +50,7 @@
 	"ethmtu=1500\0eth1mtu=1500\0"				\
 	"update_uboot=sf probe; dhcp; "				\
 		"mw.b ${loadaddr} 0x0 0xd0000; "		\
-		"tftpboot ${loadaddr} u-boot-spl.kwb; "		\
+		"tftpboot ${loadaddr} u-boot-with-spl.kwb; "	\
 		"sf update ${loadaddr} 0x0 0xd0000\0"
 
 
Signature · 1 line
2.20.1
#7 lore raw

Stefan, it is OK now?

Quoted 219 lines · On Wednesday 02 November 2022 18:51:28 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.

Also update documentation about file name changes.

---
 Kconfig                            |  2 +-
 Makefile                           |  4 ++--
 board/Marvell/db-88f6820-gp/README |  6 +++---
 board/kobol/helios4/README         |  6 +++---
 board/solidrun/clearfog/README     |  8 ++++----
 doc/README.armada-secureboot       |  4 ++--
 doc/kwboot.1                       | 12 ++++++------
 include/configs/ds414.h            |  2 +-
 8 files changed, 22 insertions(+), 22 deletions(-)
Kconfig +1 -1
index ef94f88adc28..43d4a48ac808 100644
@@ -456,7 +456,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)
Makefile +2 -2
index d5c2c9700921..eb0cc1ac060f 100644
@@ -1422,7 +1422,7 @@ KWD_CONFIG_FILE = $(shell \
 MKIMAGEFLAGS_u-boot.kwb = -n $(KWD_CONFIG_FILE) \
 	-T kwbimage -a $(CONFIG_TEXT_BASE) -e $(CONFIG_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_TEXT_BASE) -e $(CONFIG_TEXT_BASE) \
 	$(if $(KEYDIR),-k $(KEYDIR))
 
@@ -1463,7 +1463,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)
 	$(BOARD_SIZE_CHECK)
 
board/Marvell/db-88f6820-gp/README +3 -3
index 9bea5b35cb40..b4db6ed62577 100644
@@ -2,17 +2,17 @@ Update from original Marvell U-Boot to mainline U-Boot:
 -------------------------------------------------------
 
 The resulting image including the SPL binary with the
-full DDR setup is "u-boot-spl.kwb".
+full DDR setup is "u-boot-with-spl.kwb".
 
 To update the SPI NOR flash, please use the following
 command:
 
-=> sf probe;tftpboot 2000000 db-88f6820-gp/u-boot-spl.kwb;\
+=> sf probe;tftpboot 2000000 db-88f6820-gp/u-boot-with-spl.kwb;\
 sf update 2000000 0 60000
 
 Note that the original Marvell U-Boot seems to have
 problems with the "sf update" command. This does not
 work reliable. So here this command should be used:
 
-=> sf probe;tftpboot 2000000 db-88f6820-gp/u-boot-spl.kwb;\
+=> sf probe;tftpboot 2000000 db-88f6820-gp/u-boot-with-spl.kwb;\
 sf erase 0 60000;sf write 2000000 0 60000
board/kobol/helios4/README +3 -3
index 749f04827824..d615cdd2648b 100644
@@ -7,12 +7,12 @@ $ make helios4_defconfig
 $ make
 
 The resulting image including the SPL binary with the
-full DDR setup is "u-boot-spl.kwb".
+full DDR setup is "u-boot-with-spl.kwb".
 
 Now all you need to do is copy this image on a SD card.
 For example with this command:
 
-$ sudo dd if=u-boot-spl.kwb of=/dev/sdX bs=512 seek=1
+$ sudo dd if=u-boot-with-spl.kwb of=/dev/sdX bs=512 seek=1
 
 Please use the correct device node for your setup instead
 of "/dev/sdX" here!
@@ -38,7 +38,7 @@ Set the SW1 DIP switches to UART boot (see above).
 
 Run the following command to initiate U-Boot download:
 
-  ./tools/kwboot -p -b u-boot-spl.kwb /dev/ttyUSBX
+  ./tools/kwboot -p -b u-boot-with-spl.kwb /dev/ttyUSBX
 
 Use the correct UART device node for /dev/ttyUSBX.
 
board/solidrun/clearfog/README +4 -4
index 9375be84957a..ed4a712c5aa2 100644
@@ -7,12 +7,12 @@ $ make clearfog_defconfig
 $ make
 
 The resulting image including the SPL binary with the
-full DDR setup is "u-boot-spl.kwb".
+full DDR setup is "u-boot-with-spl.kwb".
 
 Now all you need to do is copy this image on a SD card.
 For example with this command:
 
-$ sudo dd if=u-boot-spl.kwb of=/dev/sdX bs=512 seek=1
+$ sudo dd if=u-boot-with-spl.kwb of=/dev/sdX bs=512 seek=1
 
 Please use the correct device node for your setup instead
 of "/dev/sdX" here!
@@ -29,7 +29,7 @@ command:
 Install U-Boot on eMMC boot partition from Linux running on Clearfog:
 
   echo 0 > /sys/block/mmcblk0boot0/force_ro
-  dd if=u-boot-spl.kwb of=/dev/mmcblk0boot0
+  dd if=u-boot-with-spl.kwb of=/dev/mmcblk0boot0
 
 Note that the SD card is not accessible when the Clearfog SOM has eMMC.
 Consider initial boot from UART (see below).
@@ -66,7 +66,7 @@ Set the SW1 DIP switches to UART boot (see above).
 
 Run the following command to initiate U-Boot download:
 
-  ./tools/kwboot -b u-boot-spl.kwb /dev/ttyUSBX
+  ./tools/kwboot -b u-boot-with-spl.kwb /dev/ttyUSBX
 
 Use the correct UART device node for /dev/ttyUSBX.
 
doc/README.armada-secureboot +2 -2
index 157cb5a231a9..4ec89d5c061f 100644
@@ -257,13 +257,13 @@ ARM architecture
 
 The creation of the boot image is done via the usual invocation of make (with a
 suitably set CROSS_COMPILE environment variable, of course). The resulting boot
-image u-boot-spl.kwb can then be tested, if so desired. The hdrparser from [5]
+image u-boot-with-spl.kwb can then be tested, if so desired. The hdrparser from [5]
 can be used for this purpose. To build the tool, invoke make in the
 'tools/marvell/doimage_mv' directory of [5], which builds a stand-alone
 hdrparser executable. A test can be conducted by calling hdrparser with the
 produced boot image and the following (mandatory) parameters:
 
-./hdrparser -k 0 -t u-boot-spl.kwb
+./hdrparser -k 0 -t u-boot-with-spl.kwb
 
 Here we assume that the CSK index is 0 and the boot image file resides in the
 same directory (adapt accordingly if needed). The tool should report that all
doc/kwboot.1 +6 -6
index 0863d197fd49..a528fbbe8c38 100644
@@ -149,25 +149,25 @@ Tested values for \fIbaudrate\fP for Armada 38x include: 115200,
 
 .SH "EXAMPLES"
 
-Instruct BootROM to enter boot Xmodem boot mode, send \fIu-boot-spl.kwb\fP
+Instruct BootROM to enter boot Xmodem boot mode, send \fIu-boot-with-spl.kwb\fP
 kwbimage file via Xmodem on \fI/dev/ttyUSB0\fP at 115200 Bd and run terminal
 program:
 .IP
-.B kwboot -b u-boot-spl.kwb -t /dev/ttyUSB0
+.B kwboot -b u-boot-with-spl.kwb -t /dev/ttyUSB0
 
 .PP
 Instruct BootROM to enter boot Xmodem boot mode, send header of
-\fIu-boot-spl.kwb\fP kwbimage file via Xmodem at 115200 Bd, then instruct
+\fIu-boot-with-spl.kwb\fP kwbimage file via Xmodem at 115200 Bd, then instruct
 BootROM to change baudrate to 5200000 Bd, send data part of the kwbimage
 file via Xmodem at high speed and finally run terminal program:
 .IP
-.B kwboot -b u-boot-spl.kwb -B 5200000 -t /dev/ttyUSB0
+.B kwboot -b u-boot-with-spl.kwb -B 5200000 -t /dev/ttyUSB0
 
 .PP
-Only send \fIu-boot-spl.kwb\fP kwbimage file via Xmodem on \fI/dev/ttyUSB0\fP
+Only send \fIu-boot-with-spl.kwb\fP kwbimage file via Xmodem on \fI/dev/ttyUSB0\fP
 at 115200 Bd:
 .IP
-.B kwboot -D u-boot-spl.kwb /dev/ttyUSB0
+.B kwboot -D u-boot-with-spl.kwb /dev/ttyUSB0
 
 .PP
 Instruct BootROM to enter console debug mode and run terminal program on
include/configs/ds414.h +1 -1
index f8273a92f11a..76d1713fdc68 100644
@@ -50,7 +50,7 @@
 	"ethmtu=1500\0eth1mtu=1500\0"				\
 	"update_uboot=sf probe; dhcp; "				\
 		"mw.b ${loadaddr} 0x0 0xd0000; "		\
-		"tftpboot ${loadaddr} u-boot-spl.kwb; "		\
+		"tftpboot ${loadaddr} u-boot-with-spl.kwb; "	\
 		"sf update ${loadaddr} 0x0 0xd0000\0"
 
 
Signature · 1 line
2.20.1
Reviewed-by
#8 lore raw

Hi Pali,

Quoted 1 line · Pali Rohár

Stefan, it is OK now?

Yes, I think so. I'm just now running a CI world build and will push this shortly if no problems show up:

Thanks,
Stefan

Quoted 217 lines · On Wednesday 02 November 2022 18:51:28 Pali Rohár wrote:
Quoted 216 lines

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.

Also update documentation about file name changes.

---
  Kconfig                            |  2 +-
  Makefile                           |  4 ++--
  board/Marvell/db-88f6820-gp/README |  6 +++---
  board/kobol/helios4/README         |  6 +++---
  board/solidrun/clearfog/README     |  8 ++++----
  doc/README.armada-secureboot       |  4 ++--
  doc/kwboot.1                       | 12 ++++++------
  include/configs/ds414.h            |  2 +-
  8 files changed, 22 insertions(+), 22 deletions(-)
Kconfig +1 -1
index ef94f88adc28..43d4a48ac808 100644
@@ -456,7 +456,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)
Makefile +2 -2
index d5c2c9700921..eb0cc1ac060f 100644
@@ -1422,7 +1422,7 @@ KWD_CONFIG_FILE = $(shell \
  MKIMAGEFLAGS_u-boot.kwb = -n $(KWD_CONFIG_FILE) \
  	-T kwbimage -a $(CONFIG_TEXT_BASE) -e $(CONFIG_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_TEXT_BASE) -e $(CONFIG_TEXT_BASE) \
  	$(if $(KEYDIR),-k $(KEYDIR))
 
@@ -1463,7 +1463,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)
  	$(BOARD_SIZE_CHECK)
 
board/Marvell/db-88f6820-gp/README +3 -3
index 9bea5b35cb40..b4db6ed62577 100644
@@ -2,17 +2,17 @@ Update from original Marvell U-Boot to mainline U-Boot:
  -------------------------------------------------------
 
  The resulting image including the SPL binary with the
-full DDR setup is "u-boot-spl.kwb".
+full DDR setup is "u-boot-with-spl.kwb".
 
  To update the SPI NOR flash, please use the following
  command:
 
-=> sf probe;tftpboot 2000000 db-88f6820-gp/u-boot-spl.kwb;\
+=> sf probe;tftpboot 2000000 db-88f6820-gp/u-boot-with-spl.kwb;\
  sf update 2000000 0 60000
 
  Note that the original Marvell U-Boot seems to have
  problems with the "sf update" command. This does not
  work reliable. So here this command should be used:
 
-=> sf probe;tftpboot 2000000 db-88f6820-gp/u-boot-spl.kwb;\
+=> sf probe;tftpboot 2000000 db-88f6820-gp/u-boot-with-spl.kwb;\
  sf erase 0 60000;sf write 2000000 0 60000
board/kobol/helios4/README +3 -3
index 749f04827824..d615cdd2648b 100644
@@ -7,12 +7,12 @@ $ make helios4_defconfig
  $ make
 
  The resulting image including the SPL binary with the
-full DDR setup is "u-boot-spl.kwb".
+full DDR setup is "u-boot-with-spl.kwb".
 
  Now all you need to do is copy this image on a SD card.
  For example with this command:
 
-$ sudo dd if=u-boot-spl.kwb of=/dev/sdX bs=512 seek=1
+$ sudo dd if=u-boot-with-spl.kwb of=/dev/sdX bs=512 seek=1
 
  Please use the correct device node for your setup instead
  of "/dev/sdX" here!
@@ -38,7 +38,7 @@ Set the SW1 DIP switches to UART boot (see above).
 
  Run the following command to initiate U-Boot download:
 
-  ./tools/kwboot -p -b u-boot-spl.kwb /dev/ttyUSBX
+  ./tools/kwboot -p -b u-boot-with-spl.kwb /dev/ttyUSBX
 
  Use the correct UART device node for /dev/ttyUSBX.
 
board/solidrun/clearfog/README +4 -4
index 9375be84957a..ed4a712c5aa2 100644
@@ -7,12 +7,12 @@ $ make clearfog_defconfig
  $ make
 
  The resulting image including the SPL binary with the
-full DDR setup is "u-boot-spl.kwb".
+full DDR setup is "u-boot-with-spl.kwb".
 
  Now all you need to do is copy this image on a SD card.
  For example with this command:
 
-$ sudo dd if=u-boot-spl.kwb of=/dev/sdX bs=512 seek=1
+$ sudo dd if=u-boot-with-spl.kwb of=/dev/sdX bs=512 seek=1
 
  Please use the correct device node for your setup instead
  of "/dev/sdX" here!
@@ -29,7 +29,7 @@ command:
  Install U-Boot on eMMC boot partition from Linux running on Clearfog:
 
    echo 0 > /sys/block/mmcblk0boot0/force_ro
-  dd if=u-boot-spl.kwb of=/dev/mmcblk0boot0
+  dd if=u-boot-with-spl.kwb of=/dev/mmcblk0boot0
 
  Note that the SD card is not accessible when the Clearfog SOM has eMMC.
  Consider initial boot from UART (see below).
@@ -66,7 +66,7 @@ Set the SW1 DIP switches to UART boot (see above).
 
  Run the following command to initiate U-Boot download:
 
-  ./tools/kwboot -b u-boot-spl.kwb /dev/ttyUSBX
+  ./tools/kwboot -b u-boot-with-spl.kwb /dev/ttyUSBX
 
  Use the correct UART device node for /dev/ttyUSBX.
 
doc/README.armada-secureboot +2 -2
index 157cb5a231a9..4ec89d5c061f 100644
@@ -257,13 +257,13 @@ ARM architecture
 
  The creation of the boot image is done via the usual invocation of make (with a
  suitably set CROSS_COMPILE environment variable, of course). The resulting boot
-image u-boot-spl.kwb can then be tested, if so desired. The hdrparser from [5]
+image u-boot-with-spl.kwb can then be tested, if so desired. The hdrparser from [5]
  can be used for this purpose. To build the tool, invoke make in the
  'tools/marvell/doimage_mv' directory of [5], which builds a stand-alone
  hdrparser executable. A test can be conducted by calling hdrparser with the
  produced boot image and the following (mandatory) parameters:
 
-./hdrparser -k 0 -t u-boot-spl.kwb
+./hdrparser -k 0 -t u-boot-with-spl.kwb
 
  Here we assume that the CSK index is 0 and the boot image file resides in the
  same directory (adapt accordingly if needed). The tool should report that all
doc/kwboot.1 +6 -6
index 0863d197fd49..a528fbbe8c38 100644
@@ -149,25 +149,25 @@ Tested values for \fIbaudrate\fP for Armada 38x include: 115200,
 
  .SH "EXAMPLES"
 
-Instruct BootROM to enter boot Xmodem boot mode, send \fIu-boot-spl.kwb\fP
+Instruct BootROM to enter boot Xmodem boot mode, send \fIu-boot-with-spl.kwb\fP
  kwbimage file via Xmodem on \fI/dev/ttyUSB0\fP at 115200 Bd and run terminal
  program:
  .IP
-.B kwboot -b u-boot-spl.kwb -t /dev/ttyUSB0
+.B kwboot -b u-boot-with-spl.kwb -t /dev/ttyUSB0
 
  .PP
  Instruct BootROM to enter boot Xmodem boot mode, send header of
-\fIu-boot-spl.kwb\fP kwbimage file via Xmodem at 115200 Bd, then instruct
+\fIu-boot-with-spl.kwb\fP kwbimage file via Xmodem at 115200 Bd, then instruct
  BootROM to change baudrate to 5200000 Bd, send data part of the kwbimage
  file via Xmodem at high speed and finally run terminal program:
  .IP
-.B kwboot -b u-boot-spl.kwb -B 5200000 -t /dev/ttyUSB0
+.B kwboot -b u-boot-with-spl.kwb -B 5200000 -t /dev/ttyUSB0
 
  .PP
-Only send \fIu-boot-spl.kwb\fP kwbimage file via Xmodem on \fI/dev/ttyUSB0\fP
+Only send \fIu-boot-with-spl.kwb\fP kwbimage file via Xmodem on \fI/dev/ttyUSB0\fP
  at 115200 Bd:
  .IP
-.B kwboot -D u-boot-spl.kwb /dev/ttyUSB0
+.B kwboot -D u-boot-with-spl.kwb /dev/ttyUSB0
 
  .PP
  Instruct BootROM to enter console debug mode and run terminal program on
include/configs/ds414.h +1 -1
index f8273a92f11a..76d1713fdc68 100644
@@ -50,7 +50,7 @@
  	"ethmtu=1500\0eth1mtu=1500\0"				\
  	"update_uboot=sf probe; dhcp; "				\
  		"mw.b ${loadaddr} 0x0 0xd0000; "		\
-		"tftpboot ${loadaddr} u-boot-spl.kwb; "		\
+		"tftpboot ${loadaddr} u-boot-with-spl.kwb; "	\
  		"sf update ${loadaddr} 0x0 0xd0000\0"
 
 
Quoted 3 lines
Quoted 3 lines
Signature · 1 line
2.20.1

Viele Grüße,
Stefan Roese

Signature · 3 lines
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: [email protected]
#9 lore raw
In reply to Pali Rohár
Quoted 1 line · Pali Rohár

Stefan, it is OK now?

Applied to u-boot-marvell/master

Thanks,
Stefan

Quoted 217 lines · On Wednesday 02 November 2022 18:51:28 Pali Rohár wrote:
Quoted 216 lines

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.

Also update documentation about file name changes.

---
  Kconfig                            |  2 +-
  Makefile                           |  4 ++--
  board/Marvell/db-88f6820-gp/README |  6 +++---
  board/kobol/helios4/README         |  6 +++---
  board/solidrun/clearfog/README     |  8 ++++----
  doc/README.armada-secureboot       |  4 ++--
  doc/kwboot.1                       | 12 ++++++------
  include/configs/ds414.h            |  2 +-
  8 files changed, 22 insertions(+), 22 deletions(-)
Kconfig +1 -1
index ef94f88adc28..43d4a48ac808 100644
@@ -456,7 +456,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)
Makefile +2 -2
index d5c2c9700921..eb0cc1ac060f 100644
@@ -1422,7 +1422,7 @@ KWD_CONFIG_FILE = $(shell \
  MKIMAGEFLAGS_u-boot.kwb = -n $(KWD_CONFIG_FILE) \
  	-T kwbimage -a $(CONFIG_TEXT_BASE) -e $(CONFIG_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_TEXT_BASE) -e $(CONFIG_TEXT_BASE) \
  	$(if $(KEYDIR),-k $(KEYDIR))
 
@@ -1463,7 +1463,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)
  	$(BOARD_SIZE_CHECK)
 
board/Marvell/db-88f6820-gp/README +3 -3
index 9bea5b35cb40..b4db6ed62577 100644
@@ -2,17 +2,17 @@ Update from original Marvell U-Boot to mainline U-Boot:
  -------------------------------------------------------
 
  The resulting image including the SPL binary with the
-full DDR setup is "u-boot-spl.kwb".
+full DDR setup is "u-boot-with-spl.kwb".
 
  To update the SPI NOR flash, please use the following
  command:
 
-=> sf probe;tftpboot 2000000 db-88f6820-gp/u-boot-spl.kwb;\
+=> sf probe;tftpboot 2000000 db-88f6820-gp/u-boot-with-spl.kwb;\
  sf update 2000000 0 60000
 
  Note that the original Marvell U-Boot seems to have
  problems with the "sf update" command. This does not
  work reliable. So here this command should be used:
 
-=> sf probe;tftpboot 2000000 db-88f6820-gp/u-boot-spl.kwb;\
+=> sf probe;tftpboot 2000000 db-88f6820-gp/u-boot-with-spl.kwb;\
  sf erase 0 60000;sf write 2000000 0 60000
board/kobol/helios4/README +3 -3
index 749f04827824..d615cdd2648b 100644
@@ -7,12 +7,12 @@ $ make helios4_defconfig
  $ make
 
  The resulting image including the SPL binary with the
-full DDR setup is "u-boot-spl.kwb".
+full DDR setup is "u-boot-with-spl.kwb".
 
  Now all you need to do is copy this image on a SD card.
  For example with this command:
 
-$ sudo dd if=u-boot-spl.kwb of=/dev/sdX bs=512 seek=1
+$ sudo dd if=u-boot-with-spl.kwb of=/dev/sdX bs=512 seek=1
 
  Please use the correct device node for your setup instead
  of "/dev/sdX" here!
@@ -38,7 +38,7 @@ Set the SW1 DIP switches to UART boot (see above).
 
  Run the following command to initiate U-Boot download:
 
-  ./tools/kwboot -p -b u-boot-spl.kwb /dev/ttyUSBX
+  ./tools/kwboot -p -b u-boot-with-spl.kwb /dev/ttyUSBX
 
  Use the correct UART device node for /dev/ttyUSBX.
 
board/solidrun/clearfog/README +4 -4
index 9375be84957a..ed4a712c5aa2 100644
@@ -7,12 +7,12 @@ $ make clearfog_defconfig
  $ make
 
  The resulting image including the SPL binary with the
-full DDR setup is "u-boot-spl.kwb".
+full DDR setup is "u-boot-with-spl.kwb".
 
  Now all you need to do is copy this image on a SD card.
  For example with this command:
 
-$ sudo dd if=u-boot-spl.kwb of=/dev/sdX bs=512 seek=1
+$ sudo dd if=u-boot-with-spl.kwb of=/dev/sdX bs=512 seek=1
 
  Please use the correct device node for your setup instead
  of "/dev/sdX" here!
@@ -29,7 +29,7 @@ command:
  Install U-Boot on eMMC boot partition from Linux running on Clearfog:
 
    echo 0 > /sys/block/mmcblk0boot0/force_ro
-  dd if=u-boot-spl.kwb of=/dev/mmcblk0boot0
+  dd if=u-boot-with-spl.kwb of=/dev/mmcblk0boot0
 
  Note that the SD card is not accessible when the Clearfog SOM has eMMC.
  Consider initial boot from UART (see below).
@@ -66,7 +66,7 @@ Set the SW1 DIP switches to UART boot (see above).
 
  Run the following command to initiate U-Boot download:
 
-  ./tools/kwboot -b u-boot-spl.kwb /dev/ttyUSBX
+  ./tools/kwboot -b u-boot-with-spl.kwb /dev/ttyUSBX
 
  Use the correct UART device node for /dev/ttyUSBX.
 
doc/README.armada-secureboot +2 -2
index 157cb5a231a9..4ec89d5c061f 100644
@@ -257,13 +257,13 @@ ARM architecture
 
  The creation of the boot image is done via the usual invocation of make (with a
  suitably set CROSS_COMPILE environment variable, of course). The resulting boot
-image u-boot-spl.kwb can then be tested, if so desired. The hdrparser from [5]
+image u-boot-with-spl.kwb can then be tested, if so desired. The hdrparser from [5]
  can be used for this purpose. To build the tool, invoke make in the
  'tools/marvell/doimage_mv' directory of [5], which builds a stand-alone
  hdrparser executable. A test can be conducted by calling hdrparser with the
  produced boot image and the following (mandatory) parameters:
 
-./hdrparser -k 0 -t u-boot-spl.kwb
+./hdrparser -k 0 -t u-boot-with-spl.kwb
 
  Here we assume that the CSK index is 0 and the boot image file resides in the
  same directory (adapt accordingly if needed). The tool should report that all
doc/kwboot.1 +6 -6
index 0863d197fd49..a528fbbe8c38 100644
@@ -149,25 +149,25 @@ Tested values for \fIbaudrate\fP for Armada 38x include: 115200,
 
  .SH "EXAMPLES"
 
-Instruct BootROM to enter boot Xmodem boot mode, send \fIu-boot-spl.kwb\fP
+Instruct BootROM to enter boot Xmodem boot mode, send \fIu-boot-with-spl.kwb\fP
  kwbimage file via Xmodem on \fI/dev/ttyUSB0\fP at 115200 Bd and run terminal
  program:
  .IP
-.B kwboot -b u-boot-spl.kwb -t /dev/ttyUSB0
+.B kwboot -b u-boot-with-spl.kwb -t /dev/ttyUSB0
 
  .PP
  Instruct BootROM to enter boot Xmodem boot mode, send header of
-\fIu-boot-spl.kwb\fP kwbimage file via Xmodem at 115200 Bd, then instruct
+\fIu-boot-with-spl.kwb\fP kwbimage file via Xmodem at 115200 Bd, then instruct
  BootROM to change baudrate to 5200000 Bd, send data part of the kwbimage
  file via Xmodem at high speed and finally run terminal program:
  .IP
-.B kwboot -b u-boot-spl.kwb -B 5200000 -t /dev/ttyUSB0
+.B kwboot -b u-boot-with-spl.kwb -B 5200000 -t /dev/ttyUSB0
 
  .PP
-Only send \fIu-boot-spl.kwb\fP kwbimage file via Xmodem on \fI/dev/ttyUSB0\fP
+Only send \fIu-boot-with-spl.kwb\fP kwbimage file via Xmodem on \fI/dev/ttyUSB0\fP
  at 115200 Bd:
  .IP
-.B kwboot -D u-boot-spl.kwb /dev/ttyUSB0
+.B kwboot -D u-boot-with-spl.kwb /dev/ttyUSB0
 
  .PP
  Instruct BootROM to enter console debug mode and run terminal program on
include/configs/ds414.h +1 -1
index f8273a92f11a..76d1713fdc68 100644
@@ -50,7 +50,7 @@
  	"ethmtu=1500\0eth1mtu=1500\0"				\
  	"update_uboot=sf probe; dhcp; "				\
  		"mw.b ${loadaddr} 0x0 0xd0000; "		\
-		"tftpboot ${loadaddr} u-boot-spl.kwb; "		\
+		"tftpboot ${loadaddr} u-boot-with-spl.kwb; "	\
  		"sf update ${loadaddr} 0x0 0xd0000\0"
 
 
Quoted 3 lines
Quoted 3 lines
Signature · 1 line
2.20.1

Viele Grüße,
Stefan Roese

Signature · 3 lines
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: [email protected]