From nobody Sat Nov 15 02:22:47 2025 X-Original-To: dev-commits-src-main@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 4d7d875RFzz6Grdp; Sat, 15 Nov 2025 02:22:47 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d7d873XvLz3yj0; Sat, 15 Nov 2025 02:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763173367; 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=QLPKik0C2+79YA6HYaUFQWOO6tuPZ+lz97CGQJe5Gh8=; b=JgeAINVfrMAXS0GEoh61KTLfKD1fN1PZqAdshkWieGLdypQU7UL9hh/ZEnUurKjd0nhIsW pgKQ/aQciLWS/QGb3yGr43QBhnbjo7Mbpr82p0Lh2cJM2gOhixUNYBJLTTbonacVbOybwy 4rqVR2jVJ/fIJ0a9/anCuZatzds9+Qf6RDamvl+EVdEV3jjKKftrAI/suQ4GEP30RSBotp HynMniviLa8AEuGcGER7DzGi5ujOGJMakUEX4lJm8MfjY/RByyruozcD0V5684T7ru+TZs InFK6Q1JJPD+XQo1DiE4cb7gW7bFWyjHdLpD4jOudon6aq7YVYkHEa3r+CdJvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763173367; 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=QLPKik0C2+79YA6HYaUFQWOO6tuPZ+lz97CGQJe5Gh8=; b=W104axcZpJCe8DKTuAP3S3p9J0931UXSzzM23QxUXeTVm0owdwfWJTq8WVRRuxT/LQ3dv6 LNqyIBEv2qxNNKx7nbM2FF8V2HMWWYRdYy+eze0L9eiwrbNCLc81QuT4TPkP9uzBupfMzk 49KDh4zHT+uKWW7pXH46u3CjrlMrpmNvexTZXV88/RbZ2UkuDCkWduFJzgfwehNAEHtuOi FBBP/k+nMLgHY/TYawua0SjgoIlQRUpw/6jTJM7AYOs3lTeb0GpKO/otZ5K2g17eLnT2Hw Re9HS7oyfOFnyvMS6ljS1dC7jRf9FOrVy7yB0co9G8w36r3qogtLBwD2aPfPAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763173367; a=rsa-sha256; cv=none; b=SzBLYxvAYjsWedr2EwIpBDXqIbb++1oojmKbM1VWGFX+S8iv/vxcSUqy/DiKdg+LAWQpr5 0XiQRqQtdfCbCjhaNfkVuYwUbu/fbjnBwMNtZvYL+oj6X8BwNXL5rWi0iP5lf2/S1015fs yEMfUj/3w3RVP18p7v2NkNDUd4bJAHri2uAzcYkz89724CrQkpjMLIWhOCMplYJcb6trXz LqckcwMKBOcLlf3L6xp3OXHSOvLz6uaJ8QwTDujLb/ml1MDystg9a8Qr0e7DEHhStUIjhY vgbzwgdusn8+az7ibVa+PrzpQHjlnxnDEGm1NixZ66ApI8sVs13mALsSVVrpKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d7d8730zqzYwq; Sat, 15 Nov 2025 02:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AF2Ml48089322; Sat, 15 Nov 2025 02:22:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AF2Ml8t089319; Sat, 15 Nov 2025 02:22:47 GMT (envelope-from git) Date: Sat, 15 Nov 2025 02:22:47 GMT Message-Id: <202511150222.5AF2Ml8t089319@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: c490bc73eb68 - main - tpm: fix the conditional for the arm64 build List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c490bc73eb68556bc44da9893af9be48a360de8c Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c490bc73eb68556bc44da9893af9be48a360de8c commit c490bc73eb68556bc44da9893af9be48a360de8c Author: Kyle Evans AuthorDate: 2025-11-15 02:22:11 +0000 Commit: Kyle Evans CommitDate: 2025-11-15 02:22:15 +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. Fixes: c2e9c5bbf0229 ("tpm: Refactor TIS and add a SPI attachment") --- 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