Date: Mon, 11 Apr 2022 16:54:36 +0200 (CEST) From: freebsd@oldach.net (Helge Oldach) To: mhorne@FreeBSD.org (Mitchell Horne) Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: b9ec0b7e86ac - stable/13 - mii: include missing sources in loadable module Message-ID: <202204111454.23BEsbUe031810@nuc.oldach.net> In-Reply-To: <202204111405.23BE57SN056356@gitrepo.freebsd.org> from Mitchell Horne at "11 Apr 2022 14:05:07"
next in thread | previous in thread | raw e-mail | index | archive | help
Mitchell Horne wrote on Mon, 11 Apr 2022 16:05:07 +0200 (CEST): > 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 > > ===> mii (all) make[4]: make[4]: don't know how to make dp83822phy.c. Stop make[4]: stopped in /usr/src/sys/modules/mii make[3]: stopped in /usr/src/sys/modules *** [modules-all] Error code 2 make[2]: stopped in /usr/obj/usr/src/arm64.aarch64/sys/GENERIC --- ata_da.o --- ctfconvert -L VERSION -g ata_da.o --- if_cgem.o --- ctfconvert -L VERSION -g if_cgem.o --- al_eth.o --- ctfconvert -L VERSION -g al_eth.o 1 error make[2]: stopped in /usr/obj/usr/src/arm64.aarch64/sys/GENERIC make[1]: stopped in /usr/src make: stopped in /usr/src
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202204111454.23BEsbUe031810>