leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Pali Rohár 2022-11-02 18:51:28 +01:00 committed by Stefan Roese
parent 497db3ad89
commit 87ac4b4b4c
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Kconfig
View File

@ -456,7 +456,7 @@ config BUILD_TARGET
string "Build target special images" string "Build target special images"
default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_ARRIA10 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.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-elf.srec" if RCAR_GEN3
default "u-boot.itb" if !BINMAN && SPL_LOAD_FIT && (ARCH_ROCKCHIP || \ default "u-boot.itb" if !BINMAN && SPL_LOAD_FIT && (ARCH_ROCKCHIP || \
ARCH_SUNXI || RISCV || ARCH_ZYNQMP) ARCH_SUNXI || RISCV || ARCH_ZYNQMP)

4
Makefile
View File

@ -1422,7 +1422,7 @@ KWD_CONFIG_FILE = $(shell \
MKIMAGEFLAGS_u-boot.kwb = -n $(KWD_CONFIG_FILE) \ MKIMAGEFLAGS_u-boot.kwb = -n $(KWD_CONFIG_FILE) \
-T kwbimage -a $(CONFIG_TEXT_BASE) -e $(CONFIG_TEXT_BASE) -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) \ -T kwbimage -a $(CONFIG_TEXT_BASE) -e $(CONFIG_TEXT_BASE) \
$(if $(KEYDIR),-k $(KEYDIR)) $(if $(KEYDIR),-k $(KEYDIR))
@ -1463,7 +1463,7 @@ u-boot.itb: u-boot-nodtb.bin \
$(BOARD_SIZE_CHECK) $(BOARD_SIZE_CHECK)
endif 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) $(call if_changed,mkimage)
$(BOARD_SIZE_CHECK) $(BOARD_SIZE_CHECK)

6
board/Marvell/db-88f6820-gp/README
View File

@ -2,17 +2,17 @@ Update from original Marvell U-Boot to mainline U-Boot:
------------------------------------------------------- -------------------------------------------------------
The resulting image including the SPL binary with the 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 To update the SPI NOR flash, please use the following
command: 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 sf update 2000000 0 60000
Note that the original Marvell U-Boot seems to have Note that the original Marvell U-Boot seems to have
problems with the "sf update" command. This does not problems with the "sf update" command. This does not
work reliable. So here this command should be used: 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 sf erase 0 60000;sf write 2000000 0 60000

6
board/kobol/helios4/README
View File

@ -7,12 +7,12 @@ $ make helios4_defconfig
$ make $ make
The resulting image including the SPL binary with the 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. Now all you need to do is copy this image on a SD card.
For example with this command: 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 Please use the correct device node for your setup instead
of "/dev/sdX" here! 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: 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. Use the correct UART device node for /dev/ttyUSBX.

8
board/solidrun/clearfog/README
View File

@ -7,12 +7,12 @@ $ make clearfog_defconfig
$ make $ make
The resulting image including the SPL binary with the 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. Now all you need to do is copy this image on a SD card.
For example with this command: 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 Please use the correct device node for your setup instead
of "/dev/sdX" here! of "/dev/sdX" here!
@ -29,7 +29,7 @@ command:
Install U-Boot on eMMC boot partition from Linux running on Clearfog: Install U-Boot on eMMC boot partition from Linux running on Clearfog:
echo 0 > /sys/block/mmcblk0boot0/force_ro 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. Note that the SD card is not accessible when the Clearfog SOM has eMMC.
Consider initial boot from UART (see below). 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: 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. Use the correct UART device node for /dev/ttyUSBX.

4
doc/README.armada-secureboot
View File

@ -257,13 +257,13 @@ ARM architecture
The creation of the boot image is done via the usual invocation of make (with a 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 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 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 'tools/marvell/doimage_mv' directory of [5], which builds a stand-alone
hdrparser executable. A test can be conducted by calling hdrparser with the hdrparser executable. A test can be conducted by calling hdrparser with the
produced boot image and the following (mandatory) parameters: 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 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 same directory (adapt accordingly if needed). The tool should report that all

12
doc/kwboot.1
View File

@ -149,25 +149,25 @@ Tested values for \fIbaudrate\fP for Armada 38x include: 115200,
.SH "EXAMPLES" .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 kwbimage file via Xmodem on \fI/dev/ttyUSB0\fP at 115200 Bd and run terminal
program: program:
.IP .IP
.B kwboot -b u-boot-spl.kwb -t /dev/ttyUSB0 .B kwboot -b u-boot-with-spl.kwb -t /dev/ttyUSB0
.PP .PP
Instruct BootROM to enter boot Xmodem boot mode, send header of 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 BootROM to change baudrate to 5200000 Bd, send data part of the kwbimage
file via Xmodem at high speed and finally run terminal program: file via Xmodem at high speed and finally run terminal program:
.IP .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 .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: at 115200 Bd:
.IP .IP
.B kwboot -D u-boot-spl.kwb /dev/ttyUSB0 .B kwboot -D u-boot-with-spl.kwb /dev/ttyUSB0
.PP .PP
Instruct BootROM to enter console debug mode and run terminal program on Instruct BootROM to enter console debug mode and run terminal program on

2
include/configs/ds414.h
View File

@ -50,7 +50,7 @@
"ethmtu=1500\0eth1mtu=1500\0" \ "ethmtu=1500\0eth1mtu=1500\0" \
"update_uboot=sf probe; dhcp; " \ "update_uboot=sf probe; dhcp; " \
"mw.b ${loadaddr} 0x0 0xd0000; " \ "mw.b ${loadaddr} 0x0 0xd0000; " \
"tftpboot ${loadaddr} u-boot-spl.kwb; " \ "tftpboot ${loadaddr} u-boot-with-spl.kwb; " \
"sf update ${loadaddr} 0x0 0xd0000\0" "sf update ${loadaddr} 0x0 0xd0000\0"