From nobody Mon Apr 11 17:55:17 2022 X-Original-To: dev-commits-src-branches@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 A995F8D614D; Mon, 11 Apr 2022 17:55:17 +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 4Kcc2Y4M3Gz4qbk; Mon, 11 Apr 2022 17:55:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649699717; 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=8WluKe3wbmpoBczwvxrgHPHNsi6jt6/ABGzDwJChNqY=; b=o++xMFtiHPctGTws+vwoJLoM9UBn83MCOZutNLTQNmTsVNLK5Qxh1H8hpfajiOktYlsZln ZdPVWz7FcajFypV3Oh0Xh0zj9nm/ky4ZC60oUBhsgXlWCbuDxgI0xwXCIwUQIFuek0zkUq 8UqCya4JsYgj2DXvG/7mVBpimQViDWxSYwvkiexB2S1De/c9l677+TMrymzdJHJDMI9V3T C2N5b3C27W/VGruU5ekr0nYpfK81Kt+LYYeBr1KnTHAmoT4mpVqY6In+kZhaVqeB50JOVU RwZo1e7IpSXgg8mnENRq5xJolH6eTL8j0c0QfZyEZ/U7GVdx19ZUndmj9d4YyA== 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 716EA2776A; Mon, 11 Apr 2022 17:55:17 +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 23BHtHbX066229; Mon, 11 Apr 2022 17:55:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23BHtHFY066228; Mon, 11 Apr 2022 17:55:17 GMT (envelope-from git) Date: Mon, 11 Apr 2022 17:55:17 GMT Message-Id: <202204111755.23BHtHFY066228@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 62c0ba91c78f - stable/13 - Revert "mii: include missing sources in loadable module" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 62c0ba91c78fcc2a4a48e866a79cea7fa24011fb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649699717; 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=8WluKe3wbmpoBczwvxrgHPHNsi6jt6/ABGzDwJChNqY=; b=Kl5EYLutfD+yVahzNyPybZynJnx8msjBzxBdkNGz4FYjEjzQctDa778NATivAeutcdwD/C wOfBy9o5GYawD1X4tTcMm2p72XmuTjPg/xKUaRUGZYoG31gycWQvroRk+p1U6B+tntuJ4Q e2nClUjHbHB9tF7C04kQrK4qpGpq7iaGv3JQYNisU0i0cUlADM0HtmWRfmibh9LuZcKLbS rC7qALbrYhLNQYQu5OYePoCMAFIPjQ6AfvdqdHA+RcbQevYejSZDJVbAWoawsgBhTpo16i VgfftUq3xaNFuqe3gkoS7z/Hebkhcgxf11GG8W45N9e0xBmECpEajccVcLyDag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649699717; a=rsa-sha256; cv=none; b=lnVonu+WYBXtXmc6qnxbzzZdyK5SJxDAaT2POVZOrwqutZ1koYTtlvtZBu0TSColj0V64m i3jOu+6nB0kQCeAurk/wbpkmIx1DTHg1r7O+IlLptTNXf/rb2sS4NwnAQXFe8qu9iEVyq/ 4sBqFcA+yKalsKt8sheVT4GEYDfgmCJJalDrOczMB2D5ZwvUpsX1jFTj8bh0HW12uDSv/M cQZ7Ur2NBXhhonZY4I7rWIHSCJ16wAcqIlMZ4FF6dzhwlakMTBUqwAUh7P/HZpoR3UDswe iFF0VweJG0JzCS6IqjJ5tswBsXNKmtSbNe1/NNPHT9Ghl28mHuwoDft+vXJplw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=62c0ba91c78fcc2a4a48e866a79cea7fa24011fb commit 62c0ba91c78fcc2a4a48e866a79cea7fa24011fb Author: Mitchell Horne AuthorDate: 2022-04-11 17:54:13 +0000 Commit: Mitchell Horne CommitDate: 2022-04-11 17:54:13 +0000 Revert "mii: include missing sources in loadable module" This reverts commit b9ec0b7e86ac01d3c8634d5b3a7658b5d9d34267. It breaks the build. Reported by: Jenkins, kp --- sys/modules/mii/Makefile | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/sys/modules/mii/Makefile b/sys/modules/mii/Makefile index f53419974130..348c9b7b2845 100644 --- a/sys/modules/mii/Makefile +++ b/sys/modules/mii/Makefile @@ -3,21 +3,15 @@ .PATH: ${SRCTOP}/sys/dev/mii KMOD= miibus -SRCS= acphy.c amphy.c atphy.c axphy.c bmtphy.c brgphy.c -SRCS+= ciphy.c dp83822phy.c dp83867phy.c +SRCS= acphy.c amphy.c atphy.c axphy.c bmtphy.c brgphy.c bus_if.h +SRCS+= ciphy.c device_if.h SRCS+= e1000phy.c gentbi.c icsphy.c ip1000phy.c jmphy.c lxtphy.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+= 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+= rdcphy.c rgephy.c rlphy.c smcphy.c SRCS+= smscphy.c tdkphy.c truephy.c SRCS+= ukphy.c ukphy_subr.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 +SRCS+= xmphy.c EXPORT_SYMS= YES