From patchwork Tue Jan 9 12:07:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 186345 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2411:b0:101:2151:f287 with SMTP id m17csp61427dyi; Tue, 9 Jan 2024 04:09:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IEsekfSyqe+GIAuRzhtixu7vb246shEOPcZEhu4cupN8UVIg8Iz85GihRpyeBl7tW1EDhFC X-Received: by 2002:a05:620a:2ad7:b0:781:428e:bc0 with SMTP id bn23-20020a05620a2ad700b00781428e0bc0mr5639658qkb.51.1704802143435; Tue, 09 Jan 2024 04:09:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704802143; cv=none; d=google.com; s=arc-20160816; b=gdnqIV8XSIGF+RdU/4UIgtHfEi1vOei2L6sAh8B+2JA0I8fcnbz60uG1Jn14OHul4Z Nq9gQicD6gyqj+pKxH8AmgkKregdvhzr6bQodb2obTXY/wEbl1P6yIDVkl/6ABIWVQz1 HePROR5r8LYFdFkx725zTIOwYqKU0soYOJUuN8/bSb/4ksYk5HeNA+18imKjXqz2Hbat lOAaQAJxNW2T+8+xdjMBBJDr7OXgOFzgAv8UfMKfyaHrm4NHwtW//wsikUkyDwfPG/sm dhh2vJdImj5TQccdm3z4ch3BITrNFtojSslBtxYm/iF2v5ICCQ25dnpVxXiatSP6P1Dn MR6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=FfzJJYAdaNX23Nm8NJjjuM01qgJXHsj0llN9fgNqkhs=; fh=I/2MmNZ0xfeDyN6PIJexzYyObxcTEvIkeC0z7Z6DQ/c=; b=b/DwCrfg1Tbj3BS4nW0kpiTNR7csvVavNSqh7Q4isTLYgHzrGXBvy4LpuYEFqeA8aT Zy1V1ImChEWpnw09DW5BTH4wXW+CPsGmvgcHUN1ZtupI22OA+Bc6i27TDI9H9Oui+mSc 7T17feJSfRI+R5eTYAnnMqNYmgeawp/Kz8viZcmeTBpNVnLEWG2+uaVYpVcDHK7dQcw8 EU32rNUwa1D6rhvRw/zO2+MGALRTGcs21G7R8G9l4FlWFS9QPOV1Ft4w5LNXk2y8/4qS lSulXdZmi2YIbDhyQmkGnvM1v/SFSHsULUsSaSq4b92QQtIevpapxTWwlyRj8b0bUgAP 7DrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rzw3zg6J; spf=pass (google.com: domain of linux-kernel+bounces-20829-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-20829-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id i10-20020a05620a404a00b0078332a8ac7fsi62272qko.725.2024.01.09.04.09.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 04:09:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-20829-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rzw3zg6J; spf=pass (google.com: domain of linux-kernel+bounces-20829-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-20829-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 3C5111C23EAE for ; Tue, 9 Jan 2024 12:09:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3E82538FB9; Tue, 9 Jan 2024 12:07:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rzw3zg6J" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A0D9638DFC; Tue, 9 Jan 2024 12:07:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90B53C433C7; Tue, 9 Jan 2024 12:07:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1704802073; bh=yYqdl2V/WrEu6szOfBy/qaZwIUQ0XEnoi+ITcWxYigI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rzw3zg6JH75t7XiuBwPmn0OJf24D9UAvjZC8JDmGcEL8BaHSamz0VfM5IXu3vo+A/ J+E9jdR5QV/nlNq+setc8BpW/3gYxYB8be0V9D1VTdkNa/8l+UQWYeEyAc9THl2CZr SGSo+zAQ/+2vs8mwCJHY+IhVvxUNPuiv9m8pzZA+d/YteiGqQCg8QAfg2x5v1PnRq7 IGquQr/f6QIxxHX/wtgkEl+c/ikLOen0zDaZWVWeffh2ngCF0jPrkb8+s1Sk08qkND 7h6EhuPww6H6f/1n+GvkwUV+vRhp4Wf7vUHdV4jHjjm4zJEg3ZqDjrZl9WVLVBxg4r Xl6Is/9SvBOfw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: devicetree@vger.kernel.org, Rob Herring , Simon Glass , Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-kernel@vger.kernel.org Subject: [PATCH 3/4] kbuild: create a list of base and overlays for each DTB Date: Tue, 9 Jan 2024 21:07:36 +0900 Message-Id: <20240109120738.346061-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240109120738.346061-1-masahiroy@kernel.org> References: <20240109120738.346061-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787614612638549941 X-GMAIL-MSGID: 1787614612638549941 Some *.dtb files are assembled from a base DTB and overlays, but once they are built, there is no way to propagate such information to succeeding processes. This commit introduces the generation of *.dtlst files, listing the component *.dtb(o) files that construct the corresponding *.dtb. This is analogous to *.mod, which lists component objects for each module. Signed-off-by: Masahiro Yamada --- .gitignore | 1 + Makefile | 2 +- scripts/Makefile.build | 6 ++++++ scripts/Makefile.lib | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c59dc60ba62e..912cb713ad74 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ *.dtbo *.dtb.S *.dtbo.S +*.dtlst *.dwo *.elf *.gcno diff --git a/Makefile b/Makefile index dae6825b8082..3521bdad6db7 100644 --- a/Makefile +++ b/Makefile @@ -1927,7 +1927,7 @@ clean: $(clean-dirs) -o -name '*.ko.*' \ -o -name '*.dtb' -o -name '*.dtbo' \ -o -name '*.dtb.S' -o -name '*.dtbo.S' \ - -o -name '*.dt.yaml' -o -name 'dtbs-list' \ + -o -name '*.dt.yaml' -o -name '*.dtlst' -o -name 'dtbs-list' \ -o -name '*.dwo' -o -name '*.lst' \ -o -name '*.su' -o -name '*.mod' \ -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ diff --git a/scripts/Makefile.build b/scripts/Makefile.build index d23797dbca0f..e9fcf330ff39 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -252,6 +252,12 @@ cmd_mod = printf '%s\n' $(call real-search, $*.o, .o, -objs -y -m) | \ $(obj)/%.mod: FORCE $(call if_changed,mod) +cmd_dt_list = printf '%s\n' $(call real-search, $*.dtb, .dtb, -dtbs) | \ + $(AWK) '!x[$$0]++ { print("$(obj)/"$$0) }' > $@ + +$(obj)/%.dtlst: FORCE + $(call if_changed,dt_list) + quiet_cmd_cc_lst_c = MKLST $@ cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && \ $(CONFIG_SHELL) $(srctree)/scripts/makelst $*.o \ diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index b35d39022a30..0a492a4e4fbb 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -93,6 +93,8 @@ base-dtb-y := $(filter %.dtb, $(call real-search, $(multi-dtb-y), .dtb, -dtbs)) always-y += $(dtb-y) +always-y += $(patsubst %.dtb, %.dtlst, $(filter %.dtb, $(dtb-y))) + # Add subdir path ifneq ($(obj),.)