From patchwork Wed Feb 1 16:49:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jessica Clarke X-Patchwork-Id: 1735760 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=XZMwc4Up; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=jrtc27.com header.i=@jrtc27.com header.a=rsa-sha256 header.s=gmail.jrtc27.user header.b=Vf8grBpF; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P6SZP0TT9z23jG for ; Thu, 2 Feb 2023 03:49:49 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=vRG7O6ukBP0yN9QECm/ilj03VYuDSDDEtXcyPyZTmDk=; b=XZMwc4UpyX4MzR 7iR41Noc+pBoFsMJOq7VFpqh16CRZDOZUUMeNfN7gmTLiMYztldZrcTgZObus3e0nqvQR0sgLFO3O 3X4An+wi1dh/RTl9upCdjYmaOeCcKra46kjt+L2c7uIUadrmvflUTYO7kjLdQPm37tpKlyCQYkSV1 dgNbmmcYEYDxOoomImasossdcjdpHK191EDFosCnBupvrr6wl2DE6ueioE4AOeEId3yYt6bmqn5Z/ dn2MFekpgoncdKZfNxGIQ6ejGInJZUNyvAEXN+uySyrzHAB+odfOsuWBbKRuIGFWpGOk7Pyybr6St qkME7VxU+WNmP1SjAaWg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pNGIf-00Ct2X-C8; Wed, 01 Feb 2023 16:49:33 +0000 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pNGIb-00Cszd-E3 for opensbi@lists.infradead.org; Wed, 01 Feb 2023 16:49:31 +0000 Received: by mail-wr1-x432.google.com with SMTP id a3so11219076wrt.6 for ; Wed, 01 Feb 2023 08:49:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jrtc27.com; s=gmail.jrtc27.user; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2H5FXojmSAkQfy84KQGgIoO/Ocv1kXkC14rVZJOye1U=; b=Vf8grBpFOoCGiN4blmfKf3J0cu06u8Gf/g/GqYK/bhe4RTlIvb6Zef8COjbzqDA0XV Jl5Z8dDK4tZ3/SZKP6GWeLy0VlwbtZpryCnZ6QqODE/yup5eq1J0DFtuK8kaRDHiyiqV m2ttgwzCxNmOessneKKcOy4yuRCVY6nzahMJxdMpZ4CEt7NOX2fGFFc5CD623l92Vt6h Fi8JyQB5POwtCAQIgXQ2HjAboZfOWBr0a9fxQBMob1R9IgGiJYsLk6N9u+MbRSBX6/UV rIFWtqgp0sGBeF9N6cCb7oJURO9Qq3bZD9ioBx07IEiesZhCNK5xrCUG7guvMCvI+VqK 7JGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2H5FXojmSAkQfy84KQGgIoO/Ocv1kXkC14rVZJOye1U=; b=HRNbPhWfVzeRr2dxMgEErWCvt6LUyfZCax2keVQ60HHCa1YU9HDjnWKSOufwbm8YCW 91bGnknLXqMt0pnstAEJBnB4YPwpR4kVCwi70X2Gt+XsXHBCzME2nlcwa0PBzNw8QPnj zzvAhuxXy/XIHWXIok213iakZW/oKq5CoOstJ4pKZC0+jPrvLCmR18jCkiuFKpJMTEzs 52k9tvjJbofGiMEJqoLCJeJ3MBUEjVyZjHLiCtMKBRdHl7BrrWTTFEXH2B7RNk2fGa6l MUgKvQBuHsaKukvU65RaW5EcqxghSgHSey4tgfPsV8TM9EqjfZ9nIxvS+2GtHUlIVTq1 2x0w== X-Gm-Message-State: AO0yUKVa3xgVxXwGSEezTgxSMO5uG22avP7xRE+QbKDuHsRDFCMxMRNB pV6Bd5wayDEkzB0Vphfa27nxY9qPR5aB/qBeppD/yw== X-Google-Smtp-Source: AK7set+hX/zAu7pwmjG4l83dyn4adSjtPvhd/Docj9dfxkZkKD5r7yWexXqKzJGYHqwd6hCo+uVMTA== X-Received: by 2002:a5d:624b:0:b0:2bd:e8c2:c9bc with SMTP id m11-20020a5d624b000000b002bde8c2c9bcmr2254490wrv.42.1675270165764; Wed, 01 Feb 2023 08:49:25 -0800 (PST) Received: from Jessicas-MacBook-Pro.localdomain (global-5-143.n-2.net.cam.ac.uk. [131.111.5.143]) by smtp.gmail.com with ESMTPSA id k4-20020a5d66c4000000b002bdc19f8e8asm17849287wrw.79.2023.02.01.08.49.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 01 Feb 2023 08:49:25 -0800 (PST) Received: by Jessicas-MacBook-Pro.localdomain (Postfix, from userid 501) id D05654ADB7B8; Wed, 1 Feb 2023 16:49:24 +0000 (GMT) From: Jessica Clarke To: opensbi@lists.infradead.org Cc: Jessica Clarke , Ben Dooks Subject: [PATCH] Makefile: Add missing .dep files for fw_*.elf.ld Date: Wed, 1 Feb 2023 16:49:16 +0000 Message-Id: <20230201164916.19908-1-jrtc27@jrtc27.com> X-Mailer: git-send-email 2.37.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230201_084929_523486_D3D071CB X-CRM114-Status: UNSURE ( 7.75 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Since we don't currently create these, changes to fw_base.ldS do not cause the preprocessed fw_*.elf.ld files to be rebuilt, and thus incremental builds can end up failing with missing symbols if cros [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:432 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Since we don't currently create these, changes to fw_base.ldS do not cause the preprocessed fw_*.elf.ld files to be rebuilt, and thus incremental builds can end up failing with missing symbols if crossing the recent commits that introduced _fw_rw_offset and then replaced it with _fw_rw_start. Reported-by: Ben Dooks Signed-off-by: Jessica Clarke Reviewed-by: Anup Patel --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Makefile b/Makefile index b742d6d..b20404f 100644 --- a/Makefile +++ b/Makefile @@ -254,6 +254,7 @@ deps-y=$(platform-objs-path-y:.o=.dep) deps-y+=$(libsbi-objs-path-y:.o=.dep) deps-y+=$(libsbiutils-objs-path-y:.o=.dep) deps-y+=$(firmware-objs-path-y:.o=.dep) +deps-y+=$(firmware-elfs-path-y:=.dep) # Setup platform ABI, ISA and Code Model ifndef PLATFORM_RISCV_ABI @@ -413,6 +414,11 @@ inst_file_list = $(CMD_PREFIX)if [ ! -z "$(4)" ]; then \ inst_header_dir = $(CMD_PREFIX)mkdir -p $(1); \ echo " INSTALL $(subst $(install_root_dir)/,,$(1))"; \ cp -rf $(2) $(1) +compile_cpp_dep = $(CMD_PREFIX)mkdir -p `dirname $(1)`; \ + echo " CPP-DEP $(subst $(build_dir)/,,$(1))"; \ + printf %s `dirname $(1)`/ > $(1) && \ + $(CC) $(CPPFLAGS) -x c -MM $(3) \ + -MT `basename $(1:.dep=$(2))` >> $(1) || rm -f $(1) compile_cpp = $(CMD_PREFIX)mkdir -p `dirname $(1)`; \ echo " CPP $(subst $(build_dir)/,,$(1))"; \ $(CPP) $(CPPFLAGS) -x c $(2) | grep -v "\#" > $(1) @@ -543,6 +549,9 @@ $(platform_build_dir)/%.bin: $(platform_build_dir)/%.elf $(platform_build_dir)/%.elf: $(platform_build_dir)/%.o $(platform_build_dir)/%.elf.ld $(platform_build_dir)/lib/libplatsbi.a $(call compile_elf,$@,$@.ld,$< $(platform_build_dir)/lib/libplatsbi.a) +$(platform_build_dir)/%.dep: $(src_dir)/%.ldS $(KCONFIG_CONFIG) + $(call compile_cpp_dep,$@,.ld,$<) + $(platform_build_dir)/%.ld: $(src_dir)/%.ldS $(call compile_cpp,$@,$<)