From nobody Tue Mar 14 04:17:52 2023 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 4PbKxr6h74z3xfJ5; Tue, 14 Mar 2023 04:17:52 +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 4PbKxr67RPz454j; Tue, 14 Mar 2023 04:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678767472; 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=TREnVB7qomg6dD2pAoSCPA0u3Uw1sg/VH0t1Ti02a9g=; b=xgCCQzlz2FyyEXj3h3veIH4AR4zHsQ6pPuND90Mg//mzqSvth+2/NXCxg57bb8M7d8j5zE 9wCfThAcqQL6sO2NiRxHcnOEqVSgQJNbeedJkogf5FJqlZXNA+2mJjz80BgO1gQ2yhJRDW dFWct0/Sd6vvhnuYvuzWEJyQVYuRbqBYx3DEUpcgcEE4/t853Jos3jCapwNTe6zVmIyHDS H2Lj3FiTOtrVYg9xGKU24WV7V5xFhZDwWd/Mo61kMo+1a24PJn+Q3vYxLjjoyFd75c/HPB zO167WKBFEBd3NZRg57xDmWTaXPV+zmAAYizIDLyp3laNzaynFkgfbiFS0en1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678767472; 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=TREnVB7qomg6dD2pAoSCPA0u3Uw1sg/VH0t1Ti02a9g=; b=BFsL5deM8IkFB8urJSoYnGSnFMr0ZjBGRID4+IVEarLtrHHGl+kLbf5pAMChd2zouUJCT6 Aq8H1EcWmWIXpfQo+FEObiBsqYxtR0/vXdlSiOIOSlSbVT3qmButT0ji9JAZgfaxohlxHD +yVxK6YzCyTsYdL9DkTW85Kq1E34ZlEzSKe8AukkAbEvNVVYTA0rhLPsQeUxMHBwphbfLA lkr3MNF9TTQunF+zWcan463WMbqg+iVbtk2fLLRXA/oDHHB4eTzC4yQp4aLphrLD+ckgmu ZhfBOae3jvslUSvKXqC9SgEAv5Ppo76Ar7uQwYLRzuWxvYfb3LG5BM0DfmDPiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678767472; a=rsa-sha256; cv=none; b=mnA/X0OQl75Xl+crXyvWotE8074XFkcIsJ1oczzuEcQ1huKnUcuLKq3dl/oDVBMoSmPi4y +E89Q+sWV755HDRnGM/b7Fw4+4021ZxypCS8IAEmFLNSFdFPQipzTwUSPt/wXBgJc6Chfh EAU6MYujKhIOAEj8mAhcFCRjGib9JArJkArb86qXTQJJpaN4UnkROy4agsGBNtJTTKH2Rb uzuLdC1DtE4Efiq9JtfXMcef2ZGyu3layzg5DgB5n7rQ2m0ZO856edA/MVuVRvrJBFnIqg D1C8/gDsb31CTeUsO728amoq1Gq32948LY67bdagWyRwl2tr/fkoCbbn7biu6A== 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 4PbKxr5B2PzLml; Tue, 14 Mar 2023 04:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32E4HqUH058061; Tue, 14 Mar 2023 04:17:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32E4Hqn8058060; Tue, 14 Mar 2023 04:17:52 GMT (envelope-from git) Date: Tue, 14 Mar 2023 04:17:52 GMT Message-Id: <202303140417.32E4Hqn8058060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: aa39abd8e58f - main - arm64: Move Azure-specific config from std.hyperv to std.azure 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa39abd8e58f6559ad87ac7e9de2096c202ccce2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=aa39abd8e58f6559ad87ac7e9de2096c202ccce2 commit aa39abd8e58f6559ad87ac7e9de2096c202ccce2 Author: Jessica Clarke AuthorDate: 2023-03-14 04:12:31 +0000 Commit: Jessica Clarke CommitDate: 2023-03-14 04:12:31 +0000 arm64: Move Azure-specific config from std.hyperv to std.azure Hyper-V does not provide Mellanox hardware, some of Azure's instances do, thus the configuration to enable them does not belong in the generic std.hyperv config. Fixes: 15e7fa83ef3c ("arm64: Hyper-V: Add vPCI and Mellanox driver modules into build") --- sys/arm64/conf/GENERIC | 1 + sys/arm64/conf/std.azure | 15 +++++++++++++++ sys/arm64/conf/std.hyperv | 10 ---------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC index c53132b0c225..2267429f16d0 100644 --- a/sys/arm64/conf/GENERIC +++ b/sys/arm64/conf/GENERIC @@ -29,6 +29,7 @@ include "std.allwinner" include "std.altera" include "std.amd" include "std.arm" +include "std.azure" include "std.broadcom" include "std.cavium" include "std.ec2" diff --git a/sys/arm64/conf/std.azure b/sys/arm64/conf/std.azure new file mode 100644 index 000000000000..97ce7f0ae24c --- /dev/null +++ b/sys/arm64/conf/std.azure @@ -0,0 +1,15 @@ +# +# Azure support +# + +device hyperv + +options COMPAT_LINUXKPI +device xz + +device mlx5 +device mlxfw +device mlx5en +options RATELIMIT +options KERN_TLS +device firmware diff --git a/sys/arm64/conf/std.hyperv b/sys/arm64/conf/std.hyperv index b742c75da131..97492e6179b5 100644 --- a/sys/arm64/conf/std.hyperv +++ b/sys/arm64/conf/std.hyperv @@ -4,13 +4,3 @@ #hyper-v support device hyperv - -options COMPAT_LINUXKPI -device xz - -device mlx5 -device mlxfw -device mlx5en -options RATELIMIT -options KERN_TLS -device firmware