From nobody Fri Feb 27 02:30:12 2026 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 4fMXNh5g78z6T86Q for ; Fri, 27 Feb 2026 02:30:12 +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 4fMXNh33M4z41tX for ; Fri, 27 Feb 2026 02:30:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772159412; 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=dCwZ/FzhhNDY2ePtRWANQ3O+0tMy+vpeUGMnetAuCQc=; b=ItTKtaavSOlaCUb0bZvCJcoIXsTL/1UrH1XYt8NDQC/RFYxHgRHCKDNk9I5TkcEMF7bnIq Vx4dkuFvy4rweT8tscVzVhI0KH0tr5+tKXqSvoJ8kgoK2/2ciDRE3usCid1d7iYEy1z9az KvgSqy64Pb0V2xVfn/KM+lRjEzJ8NYrU0gxWdjk/mL7xeVBcs77x3YHCitQRQZU3X6Mabs XcyG5jUI1Cq4gFwLsJ632ZjJeaRP45rcDaplXPnoeeUvIhVUq7LNN0Im4N2+nZA2WPY0mQ ym9HMdbpwz2iZSIMxEpAb/EeVknUwI1K69fj/6rNS/MoviKyirwRbl8uXE69uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772159412; a=rsa-sha256; cv=none; b=VZpjEazDdWuS5zTKWwPaWrhD+sbOSZYOs4IKrzrz/TNS+HsE7WLtqECiIIUnZuc2zNn/5B gI9uPPzgyLc7wUw4ysM2W2tzeNhXmyX4YDwhik7K/nRr9euE70NrF2S260QtNo8z1fJImK TEryxm4Yz3kHxCYxrF2pjDH1YrHpjsoGjLaRA8MYbX4+LQ+WEuE5aynkPfLQDI6Bzuf3yq xVstZtebRqFyRTNqER/HyaLikJdDmQH+4ooWFTkdrwNxd/yq8pHuYq9auiJnn1xbjeLsWj Tc5RbYBzFeaWOGwjsykV49G6m1gfDbewASNIhwsUfl8nsw/LKecX1mDAroKViw== 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=1772159412; 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=dCwZ/FzhhNDY2ePtRWANQ3O+0tMy+vpeUGMnetAuCQc=; b=uQ/9UQu11EYyddwX4OSSWIs30RgBL2D01Gs/NhpsKqkPfZWlhrOzHNAidacch2lGL27Xj/ SIegSlrcsVTs0YFSDjwNTINgrBBnx+sF+r8MB0iwTjRotkIOXZDGidylU2eWF/PH0XUOFO RJPrn6jQQ8ks4vjltxoSLcSQmwjZDEVaRmmrIntugRH70oqmtboRQhnSIQIAuOrhgG8WH9 PlJZtPKe0439DY6h9C4Vy5Ej83XhNVSs5UZ2YC7wc8Dl/G1qScVrdMdRDjOWBfRC0XMHQ9 Rwvno1ebVZmy2dUItb+rJpFZleeqCkCjTGJDD66Xhmbcg4ECpFdo8F4fBQkxkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMXNh2dmrzycj for ; Fri, 27 Feb 2026 02:30:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21a56 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 02:30:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 9ec32912dc53 - stable/15 - brcmfmac: deal with bus attachments to the module Makefile 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9ec32912dc53ac42c0e27b22ac5dd312fe8b7b8d Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 02:30:12 +0000 Message-Id: <69a101b4.21a56.28b689d3@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9ec32912dc53ac42c0e27b22ac5dd312fe8b7b8d commit 9ec32912dc53ac42c0e27b22ac5dd312fe8b7b8d Author: Bjoern A. Zeeb AuthorDate: 2026-02-09 01:08:42 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-26 23:07:33 +0000 brcmfmac: deal with bus attachments to the module Makefile As with LinuxKPI-based wireless drivers, e.g., rtw88, PCI depends on PCI being compiled into the kernel, SDIO will depend on MMCCAM in the kernel once supported, and USB can always be loaded. Sponsored by: The FreeBSD Foundation (cherry picked from commit 98c44ccb01d9461da477ec8d784c763e4d03fb36) --- sys/modules/brcm80211/brcmfmac/Makefile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/sys/modules/brcm80211/brcmfmac/Makefile b/sys/modules/brcm80211/brcmfmac/Makefile index 67955c96db53..b0c4d75a3d17 100644 --- a/sys/modules/brcm80211/brcmfmac/Makefile +++ b/sys/modules/brcm80211/brcmfmac/Makefile @@ -3,7 +3,7 @@ DEVDIR= ${SRCTOP}/sys/contrib/dev/broadcom/brcm80211/brcmfmac .PATH: ${DEVDIR} # Should split this up into a core driver and 3 more -WITH_PCIE=1 +WITH_PCI=1 WITH_SDIO=0 WITH_USB=0 @@ -20,21 +20,24 @@ SRCS+= fweh.c fwil.c fwvid.c p2p.c pno.c proto.c vendor.c xtlv.c SRCS+= wcc/core.c cyw/core.c bca/core.c -.if defined(WITH_PCIE) && ${WITH_PCIE} > 0 -CFLAGS+= -DCONFIG_BRCMFMAC_PCIE=1 +# PCI parts; PCI needs to be compiled into the kernel and cannot be loaded. +.if defined(WITH_PCI) && ${WITH_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} SRCS+= pcie.c msgbuf.c commonring.c flowring.c +CFLAGS+= -DCONFIG_BRCMFMAC_PCIE=1 .endif -.if defined(WITH_SDIO) && ${WITH_SDIO} > 0 -CFLAGS+= -DCONFIG_BRCMFMAC_SDIO=1 +# SDIO parts; SDIO depends on an MMCCAM kernel. +.if defined(WITH_SDIO) && ${WITH_SDIO} > 0 && ${KERN_OPTS:MMMCCAM} SRCS+= sdio.c bcmsdh.c SRCS+= sdio_if.h SRCS+= sdiodevs.h +CFLAGS+= -DCONFIG_BRCMFMAC_SDIO=1 .endif +# USB parts; USB can be loaded and is unconditional on any kernel config. .if defined(WITH_USB) && ${WITH_USB} > 0 -CFLAGS+= -DCONFIG_BRCMFMAC_USB=1 SRCS+= usb.c +CFLAGS+= -DCONFIG_BRCMFMAC_USB=1 .endif .if (defined(WITH_SDIO) && ${WITH_SDIO} > 0) || \ @@ -74,7 +77,7 @@ CFLAGS+= ${LINUXKPI_INCLUDES} CFLAGS+= -ferror-limit=0 #CFLAGS+= -DCONFIG_BRCM_TRACING=${WITH_TRACING} -CFLAGS+= -DCONFIG_BRCMFMAC_PROTO_MSGBUF=${WITH_PCIE} +CFLAGS+= -DCONFIG_BRCMFMAC_PROTO_MSGBUF=${WITH_PCI} CFLAGS+= -DCONFIG_BRCMDBG=${WITH_DEBUG} #CFLAGS+= -DCONFIG_DMI=${WITH_DMI}