summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-11-07 07:56:07 -0500
committerTom Rini <trini@konsulko.com>2022-11-07 07:56:07 -0500
commit6de63bd38b553f417b38701b141335a60c1d349e (patch)
tree1b4cd87fb222967e2be85eddf2daffff5cdf81b9 /doc
parentd332cd59f7f1666e492eccdfdb0263c9cd85fc93 (diff)
parent6cc8b5db40b4d5fc23086a5116bdf1f0a3d3265a (diff)
downloadu-boot-6de63bd38b553f417b38701b141335a60c1d349e.tar.gz
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- mvebu: Support for 98DX25xx/98DX35xx (AlleyCat5) (Chris) - Makefile: Rename u-boot-spl.kwb to u-boot-with-spl.kwb (Pali) - armada: dts: Add clock to armada-ap80x uart1 (Hamish)
Diffstat (limited to 'doc')
-rw-r--r--doc/README.armada-secureboot4
-rw-r--r--doc/kwboot.112
2 files changed, 8 insertions, 8 deletions
diff --git a/doc/README.armada-secureboot b/doc/README.armada-secureboot
index 157cb5a231..4ec89d5c06 100644
--- a/doc/README.armada-secureboot
+++ b/doc/README.armada-secureboot
@@ -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
diff --git a/doc/kwboot.1 b/doc/kwboot.1
index 0863d197fd..a528fbbe8c 100644
--- a/doc/kwboot.1
+++ b/doc/kwboot.1
@@ -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