From nobody Tue Apr 30 09:09:13 2024 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 4VTDsQ123gz5JYq2; Tue, 30 Apr 2024 09:09:14 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VTDsQ0Pywz47Wr; Tue, 30 Apr 2024 09:09:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714468154; 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=n9tMslzSn485L2A0T4wxhBpWBHE2DJCXt2l2Gd5+RlE=; b=jk0JaVJS1JiOANbjnDRV6pQQYe1d5m+DUiK3YIpyXXbp8ZvCr9nxom5x5x0n9igJJrULQE 6SIy3j0oHrv7d4fj6qq6x5iiwn0vSAaB0DyskSN60Jl8QpAuxq0/rktHbr11+X/F1cjC9k L1JvzNVWx+C+yiJ5ckOOfMEBTAqDHT7Sk9H7vLTQ2gGyKeqnFL0bw8qWq/q1p+484bvMuJ kUC+rWImW6TiwvU0EaKWIAGaU7RiJUJ8s2FrU+qLdJF6sbNSkag83E/bOB97wj5O//yWqa klDO08Lxqccur1lGO8fzFRbcWWbkMhyRLvQdp0TdSiGtoVbIzPsoHJhuMoo7zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714468154; a=rsa-sha256; cv=none; b=F2A7x5kpvECW0rTslYibgB6Qz5Xc6E7W/EuqZk2OpiGU+LR8DAq01m+8q5zMn+44/draJv PHn1U2LWdYl5LVDFMWfLVEZMrR8nbOoiiXkzjYEKoQ99PAF5nzxFiq6t1+CLQmyQcrKB8F pCs3TxPZyc/z8h5HnayMuvO1rMUIlo0IIeLC+WXSblgKBQWwYp9UbeFTogriMF8ovBf+BP BYigdKqfj6Rc2kN7172kMLG4+tF5cG/OsPA08EZI4ppY9yT+q5lrGiJXsoyitBvh0aBc7h HAppQphWpjHilV19Xs6E/xbHwIPLDzcjzQ+ELRRIHuweVrYsfXfIGFmVb9Cj8A== 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=1714468154; 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=n9tMslzSn485L2A0T4wxhBpWBHE2DJCXt2l2Gd5+RlE=; b=ydRPmrZsIix2LGfS7wVvLZYonjyv11KJkEVc19Gfx9kdbQeXNi/0b7XIttsM0IKSKmflML XMs8irH53rLqNS9MRBBzcy2Jky0ZQcTTN3HGl9zfMO6BRQsOKXhItI6TJi+k2hApWByoXW NNYbiafLZ3vj7b2B3bh7Mb7ciuvFF52BA/3P/nHOJWm50rvn7p4Loe5F3cfnnFikw3upU6 eT2GHqc0m1A9PRqX2jct4NC54OJKdpY06vGAsYqYZHxPaKJYS0y/vZchVQ5jMMSxiQ6aON WNPOU2KALh1NNUdar1kaHnpzI6YVVexHBAuP4QLFjabSxHtdyGUuonogvnkHiQ== 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 4VTDsQ01TdzTD8; Tue, 30 Apr 2024 09:09:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43U99DDF061844; Tue, 30 Apr 2024 09:09:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43U99D29061841; Tue, 30 Apr 2024 09:09:13 GMT (envelope-from git) Date: Tue, 30 Apr 2024 09:09:13 GMT Message-Id: <202404300909.43U99D29061841@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: b91f2954bdc9 - main - arm64: Check for virtio for scmi_virtio.c 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b91f2954bdc99d3fb416163c4e4d237a8fbcffe1 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b91f2954bdc99d3fb416163c4e4d237a8fbcffe1 commit b91f2954bdc99d3fb416163c4e4d237a8fbcffe1 Author: Andrew Turner AuthorDate: 2024-04-30 08:50:38 +0000 Commit: Andrew Turner CommitDate: 2024-04-30 08:50:38 +0000 arm64: Check for virtio for scmi_virtio.c scmi_virtio.c depends on virtio. Check for this before including it in the kernel. Reported by: Isaac Cilia Attard (via cperciva) Sponsored by: Arm Ltd --- sys/conf/files.arm64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index c7468b577dd8..a3d4fc09da89 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -275,7 +275,7 @@ dev/firmware/arm/scmi_clk.c optional fdt scmi dev/firmware/arm/scmi_if.m optional fdt scmi dev/firmware/arm/scmi_mailbox.c optional fdt scmi dev/firmware/arm/scmi_smc.c optional fdt scmi -dev/firmware/arm/scmi_virtio.c optional fdt scmi +dev/firmware/arm/scmi_virtio.c optional fdt scmi virtio dev/firmware/arm/scmi_shmem.c optional fdt scmi dev/gpio/pl061.c optional pl061 gpio