From nobody Wed Mar 08 23:12:42 2023 X-Original-To: dev-commits-src-all@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 4PX7Q301zZz3x1Nc; Wed, 8 Mar 2023 23:12:43 +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 4PX7Q26GMTz3C5c; Wed, 8 Mar 2023 23:12:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678317162; 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=mPM4eqrj/CZmZ2ENHBbqSq3zislYYOvm/Vs2oKVtqTk=; b=gfkUQhVy4zNayVUgoyf4GWWBMDH8/GG8PbJfqXAMNFPRpKsLN7HF7uLdAo3jY/i6YmRj9A uLdolS4FlNoYCGKtcATbtDjyK7olFi1bgSai9RsCEX6yMPjIdjYsaOLY1aQXmolrKB+gqL shecD42R24YLsZV5F8sIE6VDBCoEaMTmQPBYG8D6nAJ4M37VWF79sNIczraBOtShX54lRC r8dQ/YTfe0SXQWWGk7lct0SDidlWDb6nbPpSxN1bXsDnBdkfn27XyO1estkrf6dYArNYcV vq0k3pqoIuvrEnshgw1txP75EiNWcsHbGGc2hFhiOgXh6Yf0pfSAZ6b5jz7b2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678317162; 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=mPM4eqrj/CZmZ2ENHBbqSq3zislYYOvm/Vs2oKVtqTk=; b=N5ESQtRVhXHDuF9uSdm75Tc0pAPXY5CexNZixGMVx3dyS5/zPs1Mc5OUrOe8yCnIA1+uzV 86C4dNnybNBK8rvBou9RIdx7UbOQ1aq8anxYiPP+SThtCkAcvDbDYrerClc21i8o/MNIB/ 86Exb1p+Yn3rmxrGipv7KSkQa3dxiqyiRfmf+76nSoS7rbICqWK28u+LvFeiahGhBr6Z4D 8/RNGNJbtrx7whE6RUHmSILRoTDRtwdebKx58IM9Cl3vfNpGu6Sj4X1B89eW4BRcal+BEh XSeb9IDGeiZCxwrnMzhD8tKcXONFvAAeX8kGt07r9pitm9OK2grr+WEqkRW33w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678317162; a=rsa-sha256; cv=none; b=I9aHmGR0r5TQZmIbQ7NXsv0/KS/9zCPWF3pCc0XHZWaAHeUSr5nsqqXHBAc/1bXPolE0Dy x3L5SXIbYWVzIJK6B/B++919N/N585gsNjJlWKeb+uaqwAmf86yDhzUf7XzF2DItGG6uPp HoFtzK1xQc6sT3zPJeiIqeG9ZuKJJyTcsWRnS9JiGH/KcqWQagRy39bGOlTU/aCzPlJr6M 9SAT0Z2faGtHHOkgipu6rU3pzdcGnyZhaL9jFwC2h3nsQuD0gt5vJ2bsavZzp/Z2Yqp5cN ivAdW888825uoCDKZ7WKmZm6qndGJTicD2OjiqlcTqKFUHIy5Lv7E0+RJPQiVQ== 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 4PX7Q25LcHzkf9; Wed, 8 Mar 2023 23:12:42 +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 328NCguG018957; Wed, 8 Mar 2023 23:12:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 328NCgMo018956; Wed, 8 Mar 2023 23:12:42 GMT (envelope-from git) Date: Wed, 8 Mar 2023 23:12:42 GMT Message-Id: <202303082312.328NCgMo018956@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3140e27ee5c4 - main - sys/modules/Makefile: Add a section for arm64 + x86 + powerpc64. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3140e27ee5c4f8c8cd05ab3071c8af36607c408c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3140e27ee5c4f8c8cd05ab3071c8af36607c408c commit 3140e27ee5c4f8c8cd05ab3071c8af36607c408c Author: John Baldwin AuthorDate: 2023-03-08 23:12:25 +0000 Commit: John Baldwin CommitDate: 2023-03-08 23:12:25 +0000 sys/modules/Makefile: Add a section for arm64 + x86 + powerpc64. This reduces some duplication between the existing arm64 + x86 section and the powerpc64 section. To make the diff simpler, enable mlx4 on powerpc64 since it compiles. Reviewed by: pkubaj, imp, emaste Differential Revision: https://reviews.freebsd.org/D38973 --- sys/modules/Makefile | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 0bce649ac978..3737dddb57ab 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -533,13 +533,8 @@ _rdma= rdma .endif .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "i386" -_ena= ena + ${MACHINE_CPUARCH} == "i386" || ${MACHINE_ARCH:Mpowerpc64*} != "" _ipmi= ipmi -_iwlwifi= iwlwifi -.if ${MK_SOURCELESS_UCODE} != "no" -_iwlwififw= iwlwififw -.endif _mlx4= mlx4 _mlx5= mlx5 .if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \ @@ -551,6 +546,15 @@ _mlx5en= mlx5en _mlx4ib= mlx4ib _mlx5ib= mlx5ib .endif +.endif + +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ + ${MACHINE_CPUARCH} == "i386" +_ena= ena +_iwlwifi= iwlwifi +.if ${MK_SOURCELESS_UCODE} != "no" +_iwlwififw= iwlwififw +.endif _ossl= ossl _rtw88= rtw88 .if ${MK_SOURCELESS_UCODE} != "no" @@ -844,17 +848,8 @@ _nvme= nvme .endif .if ${MACHINE_ARCH:Mpowerpc64*} != "" -_ipmi= ipmi _ixl= ixl -_mlx5= mlx5 _nvram= opal_nvram -.if ${MK_OFED} != "no" || defined(ALL_MODULES) -_mlx5ib= mlx5ib -.endif -.if (${MK_INET_SUPPORT} != "no" && ${MK_INET6_SUPPORT} != "no") || \ - defined(ALL_MODULES) -_mlx5en= mlx5en -.endif .endif .if ${MACHINE_CPUARCH} == "powerpc" && ${MACHINE_ARCH} != "powerpcspe"