From mboxrd@z Thu Jan 1 00:00:00 1970 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 888B2C25B08 for ; Wed, 17 Aug 2022 10:00:06 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 353BC84804; Wed, 17 Aug 2022 12:00:02 +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="G5n/9lrH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 684DA84807; Wed, 17 Aug 2022 11:59:59 +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 42645847EB for ; Wed, 17 Aug 2022 11:59:57 +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 C5FF3B81BA5; Wed, 17 Aug 2022 09:59:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5351BC433D6; Wed, 17 Aug 2022 09:59:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660730395; bh=Gc8kpIdJjNsGl7abtLkvBtSO6Km9gf349CuIQmuv+T8=; h=From:To:Cc:Subject:Date:From; b=G5n/9lrHXW/2GtNO4N+ArQEDjv4tID2JcbzTIZNXr4gK6GWCSkmZ2s7y2D7V9hFFu ic2bl3+10CXlXCuFm0wEwR35zSp4dS9oUpFVIfkgQ2FkfbHJ46HLDCePNbpdX+5sQ/ qPqjgI8uG7xEFVbD/FU+4BLXo9rZAjpdaTxx+ZdME0PGVkbpOQEUL4H8x0WmYjNT3W Dzh1JYOhv5czg/qXhr3Dumfbp+QG4o/cGwq8uXVzAu4E2wxQzWZ/1aAvFPAht+Rv5h jckECUsdSKF8fi5TH2k6ydaIoPX/odQZs7mDEpbhzCMfoBSPrgR1tNPpQgHq1UxlMz fERAOlTwx2Y3g== Received: by pali.im (Postfix) id 6B6D5739; Wed, 17 Aug 2022 11:59:52 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Stefan Roese , Simon Glass , Tom Rini Cc: u-boot@lists.denx.de Subject: [PATCH RFC] Makefile: Rename u-boot-spl.kwb to u-boot-with-spl.kwb Date: Wed, 17 Aug 2022 11:59:44 +0200 Message-Id: <20220817095944.4830-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 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. --- 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 -- 2.20.1