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.
Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
diff --git a/doc/README.armada-secureboot b/doc/README.armada-secureboot
index 157cb5a..4ec89d5 100644
--- a/doc/README.armada-secureboot
+++ b/doc/README.armada-secureboot
@@ -257,13 +257,13 @@
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
diff --git a/doc/kwboot.1 b/doc/kwboot.1
index 0863d19..a528fbb 100644
--- a/doc/kwboot.1
+++ b/doc/kwboot.1
@@ -149,25 +149,25 @@
.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