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 81695C6FA8B for ; Wed, 7 Sep 2022 09:25:10 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8C0F984A34; Wed, 7 Sep 2022 11:25:08 +0200 (CEST) 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="lRNKR7yo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E6EF984A1B; Wed, 7 Sep 2022 11:25:06 +0200 (CEST) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) (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 603D784A34 for ; Wed, 7 Sep 2022 11:25:03 +0200 (CEST) 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 ams.source.kernel.org (Postfix) with ESMTPS id 0451FB81BEA; Wed, 7 Sep 2022 09:25:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A81D3C433D7; Wed, 7 Sep 2022 09:25:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1662542701; bh=+mDMj2GCG1e5Ux+3WBre0XpiPeqxeSsxavKoduTUaFo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=lRNKR7yokAoDDuqvClotHooqTX/hyVu7ibD0fHtGdaBU2PeCBc3+2sogei/mrPvpJ zuzdmA7eaZFZjjYvSt2oZztey0eBks4PMgNuNTAYUmCOq/WxXtD7U9Q9DZ06vC2hdz NFpVp7pvqvFRmlgPwCOY6X1SEy87PD0aIyrh+xlT5GCsOlzuecj4BbzkFu9hvph1ib utUebekuKKk88yzB6IXQniptRTZvCATox3k42kxLNEAFkWdAOiR7OnK4paZocsv3W3 MraUPnprE5RuGmuSOWsui9h8IPdxPaMdzZJdTSqfdC0vNPJPrVxtXAYgxYHV40eafe 7TOuqDXM/tGPw== Received: by pali.im (Postfix) id C6B297F0; Wed, 7 Sep 2022 11:24:58 +0200 (CEST) Date: Wed, 7 Sep 2022 11:24:58 +0200 From: Pali =?utf-8?B?Um9ow6Fy?= To: Stefan Roese Cc: Simon Glass , Tom Rini , u-boot@lists.denx.de Subject: Re: [PATCH RFC] Makefile: Rename u-boot-spl.kwb to u-boot-with-spl.kwb Message-ID: <20220907092458.5kwabwp4ds7yxblu@pali> References: <20220817095944.4830-1-pali@kernel.org> <66172709-0fcc-696c-0ed3-2c5382c56343@denx.de> <20220817210043.ez2qdwwjo6fwmkat@pali> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220817210043.ez2qdwwjo6fwmkat@pali> 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 On Wednesday 17 August 2022 23:00:43 Pali Rohár wrote: > On Wednesday 17 August 2022 12:05:20 Stefan Roese wrote: > > On 17.08.22 11:59, 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. > > > > > > Signed-off-by: Pali Rohár > > > --- > > > This is just RFC patch, please let me know what do you think. > > > > Frankly, I wondered a few days ago if this image only includes the > > SPL image. So this change makes total sense to me. It might break > > some out-of-tree building scripts, but I think we should go forward > > this way: > > > > Reviewed-by: Stefan Roese > > Ok! If you like it, feel free to take it. First time I was also confused > and having consistent naming could help other people too... Btw, there is similar "rename" patch for u-boot-with-dtb.bin target: https://patchwork.ozlabs.org/project/uboot/patch/20220801154220.20068-2-pali@kernel.org/ > > Thanks, > > Stefan > > > > > --- > > > Kconfig | 2 +- > > > Makefile | 4 ++-- > > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > > > diff --git a/Kconfig b/Kconfig > > > index 991b260182e8..5c64ca843eed 100644 > > > --- a/Kconfig > > > +++ b/Kconfig > > > @@ -455,7 +455,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 1a66f69a4b14..b1fbdbe7d726 100644 > > > --- a/Makefile > > > +++ b/Makefile > > > @@ -1432,7 +1432,7 @@ KWD_CONFIG_FILE = $(shell \ > > > MKIMAGEFLAGS_u-boot.kwb = -n $(KWD_CONFIG_FILE) \ > > > -T kwbimage -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_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_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) \ > > > $(if $(KEYDIR),-k $(KEYDIR)) > > > @@ -1477,7 +1477,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) > > > u-boot.sha1: u-boot.bin > > > > Viele Grüße, > > Stefan Roese > > > > -- > > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk > > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany > > Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de