From nobody Sun Apr 12 03:16:25 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKj3TP2z6YLtX for ; Sun, 12 Apr 2026 03:16:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKj1Tpkz3NrL for ; Sun, 12 Apr 2026 03:16:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ni5zdXBruF1DdzDjiZ4D4jWkJm9tatUYeISFq+TsQmM=; b=W2nUvAEYhGHeyoid1JnYHsUAPmJ7uCN+2hM/6fjE2gE+4GVA7uXoEOOakLk7JNthcehQm/ pyfRgX/3PrbZ5LIV0rjB/DOoD0fcJuUmKhXst+2tjiPp/yJZAWJ85niiUioVkyDuNZHkJQ sCXb+16Neccpv8nqr14hHCyw4dOcbSjLcnLXKSBYKAOxWAecxb8Kkn5wRe4wuVLAhc+vVD JeDLzAFNc1vfKArBbCvl4lf5Ej1wTsbcA7M+d3C0762F1A1Tm0hKND4Eay8ct9Vq22TAPP HrDsfbPx8UqOi+HIfhDB8yKJhoVQvRZ/Drqlcf5xGDRePKd6ptrR2AXMhr61iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963785; a=rsa-sha256; cv=none; b=Ydd9J2DXx/cN+QwLt3Kmq0jPFBKH2Fz/te+gRnO5/Fwo3TlaSPukLvJ4YWvla8Bi7b32ow LrMLOOlHVDqp5aToGIjbYdlhELOtd3fj0+xowtU82jbQ8ke/1bCBki4M+J6AeptKZ/2RQE gNxDY0OLRml9FBTivKjczVHW250BRumy8IcPpUPwKAY8bd4mDhCZPRVt96Dfbqv6G7PGK4 upUfvE2NkgfP3D6+PdT+MOimIXmIji4kQRMqOtE7REVwyZkYzm0UL/k1nCgQxy91mrkvd5 vfAFYO9tZLeP4aJMqlcXyIZ2a/oeLJB24TCA+NwvM7vncYuC6M73rLqo8PaKtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ni5zdXBruF1DdzDjiZ4D4jWkJm9tatUYeISFq+TsQmM=; b=robixbSZdQtYwFOegbat4F+cTXPef7bkECcfMXOeQfonakSF1dLgSLdECmnhr+P8MjW9a3 omd+4Ai15nzskFQ6xjltv/FDspJSD5rcXw65DOBWxbiR+3EdjSztLGu3yHixvgw2kM4x4L HAGL8XM5UhIez3uPX6ENtdc0E19sPYaTWQRFYbviZQw8bpzZY8DFcB06tMPtP87AhpoYr6 njvEiSr9cw76jLg8PBj8zZJxKcynneSaAIf/jUlK7EzniHuY0vIkgoK5sv/M3aCA5/XpEH StfJoPxG5y+5VFzDZOMJ7SFrOwHKuOBnh4xGYkoIsGY2cLNESs76jUC+qVYXug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKj0kxTzyWC for ; Sun, 12 Apr 2026 03:16:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47509 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 4b7f99f39244 - stable/15 - tpm: fix the conditional for the arm64 build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4b7f99f392448963327f6d39361a91429acd7e9b Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:25 +0000 Message-Id: <69db0e89.47509.5645b2f6@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4b7f99f392448963327f6d39361a91429acd7e9b commit 4b7f99f392448963327f6d39361a91429acd7e9b Author: Kyle Evans AuthorDate: 2025-11-15 02:22:11 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:09 +0000 tpm: fix the conditional for the arm64 build The intention was clearly that these ACPI bits would be included for arm64, but MACHINE_ARCH there is aarch64 -- correct the minor typo to build everything that should be there. (cherry picked from commit c490bc73eb68556bc44da9893af9be48a360de8c) --- sys/modules/tpm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/modules/tpm/Makefile b/sys/modules/tpm/Makefile index d929649d40fe..e7a87a22d2ed 100644 --- a/sys/modules/tpm/Makefile +++ b/sys/modules/tpm/Makefile @@ -17,7 +17,7 @@ SRCS+= tpm20.c tpm_tis_core.c .if defined(${OPT_FDT}) SRCS+= tpm_spibus.c tpm_tis_spibus.c spibus_if.h .endif -.if ${MACHINE_ARCH:Namd64:Ni386:Narm64} == "" +.if ${MACHINE_ARCH:Namd64:Ni386:Naarch64} == "" SRCS+= acpi_if.h SRCS+= tpm_tis_acpi.c SRCS+= tpm_crb.c