From 87ac4b4b4ca5f00e2ddcdac41c9dc691ab2aecf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Wed, 2 Nov 2022 18:51:28 +0100 Subject: Makefile: Rename u-boot-spl.kwb to u-boot-with-spl.kwb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Stefan Roese --- doc/README.armada-secureboot | 4 ++-- doc/kwboot.1 | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'doc') 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 -- cgit v1.2.1