Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 828CCC4332F for ; Sun, 6 Nov 2022 21:21:49 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DA78E84380; Sun, 6 Nov 2022 22:21:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="LjTzl582"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2ECEF841F5; Sun, 6 Nov 2022 22:21:45 +0100 (CET) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2C0C984380 for ; Sun, 6 Nov 2022 22:21:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3032160C7B; Sun, 6 Nov 2022 21:21:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49F99C433C1; Sun, 6 Nov 2022 21:21:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1667769698; bh=+a8aWimxjdYep4kDAHlaZ4+1AucC6SsACsVTK1kpeeQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LjTzl582bsSLGD+smPpvWJ7kgqIOPcP/hAWsg04/mnP9ZHfznsDKz9Cdvz+E1f9OV QPpHbus5B5x1oKApj4mt32TuTYAMWi3Xno8DZ4nrs4aAaPMDfAKXkcd+tXmBO9+jsM 5DBin3vptQVfw+FX50RfQYIXFzigeYoFquGQvEHx7eCuCqZLCcC5y6fLVWUMqYaaSv mWxlnfdwkZD4sBCICotg9sG9Wztr3Q6giXm9y1VQuUsrsOHELKxEfIW+mY/JkijCqR 0iVTatGj9V5zilzTrmfLr6ITSTburut2oihgw6XlMAPVd8UhvRkUNZvBqW3Z5EzWjt OrXEfWhr+P3Cg== Received: by pali.im (Postfix) id 4276C858; Sun, 6 Nov 2022 22:21:35 +0100 (CET) Date: Sun, 6 Nov 2022 22:21:35 +0100 From: Pali =?utf-8?B?Um9ow6Fy?= To: Stefan Roese Cc: u-boot@lists.denx.de Subject: Re: [PATCH] Makefile: Rename u-boot-spl.kwb to u-boot-with-spl.kwb Message-ID: <20221106212135.p34tpcc2p7uph4zh@pali> References: <79bc9d8b-08c1-3710-0179-617f393840b2@denx.de> <20221102175128.10654-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20221102175128.10654-1-pali@kernel.org> User-Agent: NeoMutt/20180716 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Stefan, it is OK now? 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. > > Signed-off-by: Pali Rohár > Reviewed-by: Stefan Roese > --- > 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(-) > > diff --git a/Kconfig b/Kconfig > index ef94f88adc28..43d4a48ac808 100644 > --- a/Kconfig > +++ b/Kconfig > @@ -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) > diff --git a/Makefile b/Makefile > index d5c2c9700921..eb0cc1ac060f 100644 > --- a/Makefile > +++ b/Makefile > @@ -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) > > diff --git a/board/Marvell/db-88f6820-gp/README b/board/Marvell/db-88f6820-gp/README > index 9bea5b35cb40..b4db6ed62577 100644 > --- a/board/Marvell/db-88f6820-gp/README > +++ b/board/Marvell/db-88f6820-gp/README > @@ -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 > diff --git a/board/kobol/helios4/README b/board/kobol/helios4/README > index 749f04827824..d615cdd2648b 100644 > --- a/board/kobol/helios4/README > +++ b/board/kobol/helios4/README > @@ -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. > > diff --git a/board/solidrun/clearfog/README b/board/solidrun/clearfog/README > index 9375be84957a..ed4a712c5aa2 100644 > --- a/board/solidrun/clearfog/README > +++ b/board/solidrun/clearfog/README > @@ -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. > > diff --git a/doc/README.armada-secureboot b/doc/README.armada-secureboot > index 157cb5a231a9..4ec89d5c061f 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 0863d197fd49..a528fbbe8c38 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 > diff --git a/include/configs/ds414.h b/include/configs/ds414.h > index f8273a92f11a..76d1713fdc68 100644 > --- a/include/configs/ds414.h > +++ b/include/configs/ds414.h > @@ -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" > > > -- > 2.20.1 >