git: b9ec0b7e86ac - stable/13 - mii: include missing sources in loadable module
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 11 Apr 2022 14:05:07 UTC
The branch stable/13 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=b9ec0b7e86ac01d3c8634d5b3a7658b5d9d34267
commit b9ec0b7e86ac01d3c8634d5b3a7658b5d9d34267
Author: Milan Obuch <bsd@dino.sk>
AuthorDate: 2022-04-02 18:28:33 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2022-04-11 14:04:08 +0000
mii: include missing sources in loadable module
As of today, using 'kldload miibus' is not equivalent to using 'device
miibus' in a kernel config. Newly introduced PHY drivers (DP83822,
DP83867, VSCPHY) and source files/PHY driver for FDT-enabled kernels
are missing. Without including them, kernel modules using any function
from dev/mii/mii_fdt.c refuse to load. Additionally, miivar.h directly
includes opt_platform.h.
Add the missing sources to the module build, with the FDT-only files
gated behind an OPT_FDT check. Maintain the alphabetical listing of
SRCS, but move the required header files to a separate line to improve
readability.
Reviewed by: mhorne, mindal@semihalf.com
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D34256
(cherry picked from commit 517ea731d4e803450537e9369d6a16aa4081acd7)
---
sys/modules/mii/Makefile | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/sys/modules/mii/Makefile b/sys/modules/mii/Makefile
index 348c9b7b2845..f53419974130 100644
--- a/sys/modules/mii/Makefile
+++ b/sys/modules/mii/Makefile
@@ -3,15 +3,21 @@
.PATH: ${SRCTOP}/sys/dev/mii
KMOD= miibus
-SRCS= acphy.c amphy.c atphy.c axphy.c bmtphy.c brgphy.c bus_if.h
-SRCS+= ciphy.c device_if.h
+SRCS= acphy.c amphy.c atphy.c axphy.c bmtphy.c brgphy.c
+SRCS+= ciphy.c dp83822phy.c dp83867phy.c
SRCS+= e1000phy.c gentbi.c icsphy.c ip1000phy.c jmphy.c lxtphy.c
-SRCS+= miibus_if.c miibus_if.h mii.c miidevs.h mii_bitbang.c mii_physubr.c
-SRCS+= nsgphy.c nsphy.c nsphyter.c pci_if.h pnaphy.c qsphy.c
+SRCS+= miibus_if.c mii.c mii_bitbang.c mii_physubr.c
+SRCS+= nsgphy.c nsphy.c nsphyter.c pnaphy.c qsphy.c
SRCS+= rdcphy.c rgephy.c rlphy.c smcphy.c
SRCS+= smscphy.c tdkphy.c truephy.c
SRCS+= ukphy.c ukphy_subr.c
-SRCS+= xmphy.c
+SRCS+= vscphy.c xmphy.c
+SRCS+= bus_if.h device_if.h miibus_if.h miidevs.h opt_platform.h pci_if.h
+
+.if !empty(OPT_FDT)
+SRCS+= micphy.c mii_fdt.c
+SRCS+= ofw_bus_if.h
+.endif
EXPORT_SYMS= YES