From nobody Tue Feb 10 21:54:32 2026 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 4f9b213wCGz6S6n5 for ; Tue, 10 Feb 2026 21:54:33 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9b2108YYz3Rtm for ; Tue, 10 Feb 2026 21:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770760473; 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=jcjrWtzBCWJITcXHIpvgWmG8w/elo3wKKsLnDjewmKc=; b=G2plKxIQgkearOzqcMXrH/bocRNgMLRT+cpKVRIjrxS/TIILoKrIjZHxs7DH9z+Vnxpsg9 iLrHGeISLWvFDuKyDF9xFldn4wYlblw71eUwsaoozTQGyF+br+E6uFgehbcn8UTBeXcN2P ddxeJRrRlHkeHyF/e7VG+VNoJAudyxrIUZ6kZuvmCHvRFShcNX59tDgwyAs+dz/H7cA1n0 60815HnZtkXB0ZWL/QKvOWKI0rrNpdSGpZGVHOCQdnHmnRl6HSZaGZRa0HgJbHitG28Bx0 bDVz5VZjIwUgd/g1hDoqiwLk4FQHXR9FnVZON/0V90Ds45yEYfn2Zneti81wBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770760473; a=rsa-sha256; cv=none; b=Wte/rRVEPcINxU/7YGeStANB7VPgNMwU2yWHjg8Zm+4nJ1g/XNu6o6fI5Rbv0iewo6Ni+n QVUGCjyragC7WyVbnHp6qvoefrBbA+PmkmQ2XdRr8w4S7DXCqQcOKLHi4frWbqfntqapTd mVsHH9O4DYqwNSJ2f7+u0+cqvY3bomNocD9Wa4Q6y3ibGKVwOmPMXhwkDNCMmj6otJae8t dwyDmKkgcuBFtcPho2/wDkRofHVQ8F6gJ9PdOQHeY9ns35zOoqvqRQOM/+G1Z39XV3212y 3sZ7btXvMHygEorC0fHCG5y2Dz80LogZB4qjCFrqVonebDo3/bc3OR1C6jfJYQ== 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=1770760473; 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=jcjrWtzBCWJITcXHIpvgWmG8w/elo3wKKsLnDjewmKc=; b=K5xw5lDGOupCaM5SolZIrV/0DyBHYX98F/BLCen2G1aHT693velcSdn3hxE2E3iBCbY8aJ 1Q8orlLGd/eTzM5u7IbV8SvC3zXzSSGv2rbLfcZ7hATvQA6ZFVPHC34SEGt0QJ/6gi+TAx p7RBSUdW+wgNu1eMzlORacmOVOIVS5WDy/mTEh6mWE6YNoEA6ENlfj73bRsWDQJLF3xcdS x3oKZzBy7txzHAh748n/Wr0IKfBh/nQM4s//Lt1QRMT3bXMYMIhf0lLXsWjVMZQzxiTgVK BQIpHj5qi2tUMlQ41XN9Ea+OX7iB2zU8mqcg3MMwniZ/nBGHs7FbPvL7c7+EJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9b206bmsz6LT for ; Tue, 10 Feb 2026 21:54:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f93c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 21:54:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 98c44ccb01d9 - main - brcmfmac: deal with bus attachments to the module Makefile 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98c44ccb01d9461da477ec8d784c763e4d03fb36 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 21:54:32 +0000 Message-Id: <698ba918.1f93c.38d101f2@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=98c44ccb01d9461da477ec8d784c763e4d03fb36 commit 98c44ccb01d9461da477ec8d784c763e4d03fb36 Author: Bjoern A. Zeeb AuthorDate: 2026-02-09 01:08:42 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-10 21:42:53 +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 MFC after: 3 days --- 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}