From patchwork Sun Dec 3 08:05:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 172916 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2128271vqy; Sun, 3 Dec 2023 00:06:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IFg7i9Ufo5uk4MFt/KrLtS9CUJnjRvwLEbLJBE7wHs1HwCezYI9y5EbwYRNZwcYsQ5/hl7z X-Received: by 2002:a05:6870:f112:b0:1fa:3b7d:1578 with SMTP id k18-20020a056870f11200b001fa3b7d1578mr3088679oac.41.1701590769610; Sun, 03 Dec 2023 00:06:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701590769; cv=none; d=google.com; s=arc-20160816; b=XihJIgJTlKHjp/Y2hvO1eYKiGsZd/JM12B1XAtyF07+lmkeVesaYapu4cF6TmwAyFe 26QAc1pksZP646fI0hVJBWz/cQzGwn3kUegejm7dd+QD9LdVBbNY3cCK7EJyzuYxOSBK 7Ea0SOG/vW0+M/6Pas7Mm1WMoW856J+ZyWy79nLw280P8g9OW8mN5CUZK0qHVY+VS/Bx m2jienJs2jLfTbj8E4lFlfFVf0apUSfzYV5P5EB84YaRv3LWSWyK1JbAQML2EgwIJNWn ZBAAkG83SiyYeiWsfcRwpz+sog6ULT0Ypqmfb/df/3OlhhXqy68h+J9VJKw8aPLi3AkQ Qpiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=LyNS+mERgxAAZnrPV5WJW0bE9gkM9XFdNXDz8NHvnTQ=; fh=PFwXawrH1uMeasvl/p3z1jdQgSTgo4FZ0xmHmWTcQfM=; b=lGjnj5RnHgDRl+eRHW6IIDCkDFEQ6/fku+kpClr7G+IjRfFZazoZKBWAOtMknbdD3b 61h62EM5HTamRqMqxH7RyI0I2hrmJjO72VTigmjrMDbA0rU2w8Pd9glUUaTxYLMDEPHh 4zK89bKbo5MnS4MOIt7XBOoL9foVTlCQQu4NqUB7tTTK5evRV4rgq2qy6HfOcorcfNGb Xhsa8BDOZAq21DjZGqiL7x/qLmHUvQ/xMiMbsLQo0F+mZFHk+J6ny24X1DIzzgbShljr kKCx4k3yoiRLjm5lHcou91hKBR6XEEShTHEI+pyTIvlXsw/qnSHFMRluPs/MJAzxf4hu JgSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TNblV9Jx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id t10-20020a63eb0a000000b005bd3d377a54si5861863pgh.123.2023.12.03.00.06.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 00:06:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TNblV9Jx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 4D7DF8088A77; Sun, 3 Dec 2023 00:06:07 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233192AbjLCIFt (ORCPT + 99 others); Sun, 3 Dec 2023 03:05:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229572AbjLCIFs (ORCPT ); Sun, 3 Dec 2023 03:05:48 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89B4C125 for ; Sun, 3 Dec 2023 00:05:54 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42534C433C8; Sun, 3 Dec 2023 08:05:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701590753; bh=M2GMrw4loolCdNbmGSsgw9g7ot6QbobVN3Xw7lbG/rU=; h=From:To:Cc:Subject:Date:From; b=TNblV9JxiWK9vM5Uzfx7EhgT61zuRC+CsWQPb9fqZXVyeswt9NNqjbxL1jqTLMvag QbAyup2l15WPZEy4o7QJoG6reqzPQ6DWyIUrv4GpbUFZW15twpTbasZZ9MrR6mPenP RvcK4lyNnhV4GD+StEWvqbHz9Zfe0o6Ah91LvT883+/NCOBXlVEZwwhP8JVYs1mGmc CwyE93JcXybDN+mQN3obYGyf+1QH9EemO701U2LNCYTfJqQeMGSZuvTLLEjfr/pPEy MtCuJFxjX4BOUtxe5lp1+WtYdn7hV3WcYVG0sDiqXCcYjxSPdHwAiUpL/StN4rxOEs 8AwNWFbYaN9vw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-kernel@vger.kernel.org Subject: [PATCH] kbuild: determine base DTB by suffix Date: Sun, 3 Dec 2023 17:05:48 +0900 Message-Id: <20231203080548.1869540-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sun, 03 Dec 2023 00:06:07 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784247242476615651 X-GMAIL-MSGID: 1784247242476615651 When using the -dtbs syntax, you need to ensure to list the base first, as follows: foo-dtbs := foo_base.dtb foo_overlay1.dtbo foo_overlay2.dtbo dtb-y := foo.dtb You cannot do this arrangement: foo-dtbs := foo_overlay1.dtbo foo_overlay2.dtbo foo_base.dtb This restriction comes from $(firstword ...), but it is unneeded to rely on the order in the -dtbs syntax. Instead, you can simply determine the base by suffix because the base (*.dtb) and overlays (*.dtbo) use different suffixes. Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier --- scripts/Makefile.lib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 1a965fe68e01..cd5b181060f1 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -83,8 +83,8 @@ dtb-$(CONFIG_OF_ALL_DTBS) += $(dtb-) multi-dtb-y := $(call multi-search, $(dtb-y), .dtb, -dtbs) # Primitive DTB compiled from *.dts real-dtb-y := $(call real-search, $(dtb-y), .dtb, -dtbs) -# Base DTB that overlay is applied onto (each first word of $(*-dtbs) expansion) -base-dtb-y := $(foreach m, $(multi-dtb-y), $(firstword $(call suffix-search, $m, .dtb, -dtbs))) +# Base DTB that overlay is applied onto +base-dtb-y := $(filter %.dtb, $(call real-search, $(multi-dtb-y), .dtb, -dtbs)) always-y += $(dtb-y)