git: 42be6050cec7 - stable/14 - iwlwififw: remove Intel iwlwifi firmware from src.git
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 18 Apr 2025 14:37:31 UTC
The branch stable/14 has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=42be6050cec78ed6abf2e4845f4b9e525d5c2403
commit 42be6050cec78ed6abf2e4845f4b9e525d5c2403
Author: Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2025-04-08 16:57:14 +0000
Commit: Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2025-04-18 14:36:03 +0000
iwlwififw: remove Intel iwlwifi firmware from src.git
Following the example of rtw88 and rtw89 only ship iwlwifi firmware
from ports/packages. Users are asked to run fwget(8) to install the
firmware needed for their system or build it from ports
(see also UPDATING).
This is the end of a long story adding wireless support to fwget(8),
migrating the firmware for multiple branches into ports, splitting them
up into flavors, and updating some install media and the installer to
provide firmware.
The overall amount for new firmware amongst all drivers would have
added more than 100M of binary blobs to src.git for the first import,
ignoring future updates which (along with some duplication between
multiple drivers) was considered too much.
While maintenance within the src tree certainly would have been
easier in the longer term this seems to be the better solution and
I would like to thank everyone who helped along the path to get there.
The iwlwififw.4 man page is to stay (for now) and will likely point
at the appropriate firmware package flavor in the future as well
so people may find it easier to transition. In the long term this
information is likely not needed anymore.
Sponsored by: The FreeBSD Foundation
Requested by: core (Oct 2022)
Reviewed by: thj, jrm (earlier)
Differential Revision: https://reviews.freebsd.org/D49713
(cherry picked from commit 558d638896239f9cd25b9d825ecfce62ec54681e)
(cherry picked from commit 918783b75aacb051f2f83dd0198ef68bc9fa5326)
---
ObsoleteFiles.inc | 3 +
UPDATING | 6 +
share/doc/legal/Makefile | 1 -
share/doc/legal/intel_iwlwififw/Makefile | 6 -
sys/contrib/dev/iwlwififw/LICENCE.iwlwifi_firmware | 39 --
sys/contrib/dev/iwlwififw/WHENCE | 483 ---------------------
sys/contrib/dev/iwlwififw/iwlwifi-3160-17.ucode | Bin 918268 -> 0 bytes
sys/contrib/dev/iwlwififw/iwlwifi-3168-29.ucode | Bin 1036288 -> 0 bytes
sys/contrib/dev/iwlwififw/iwlwifi-7260-17.ucode | Bin 1049340 -> 0 bytes
sys/contrib/dev/iwlwififw/iwlwifi-7265-17.ucode | Bin 1180412 -> 0 bytes
sys/contrib/dev/iwlwififw/iwlwifi-7265D-29.ucode | Bin 1036772 -> 0 bytes
sys/contrib/dev/iwlwififw/iwlwifi-8000C-36.ucode | Bin 2428004 -> 0 bytes
sys/contrib/dev/iwlwififw/iwlwifi-8265-36.ucode | Bin 2436632 -> 0 bytes
.../iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode | Bin 1518772 -> 0 bytes
.../iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode | Bin 1489652 -> 0 bytes
.../dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-77.ucode | Bin 1404704 -> 0 bytes
.../dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-77.ucode | Bin 1322436 -> 0 bytes
.../dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-77.ucode | Bin 1404720 -> 0 bytes
.../dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-77.ucode | Bin 1322452 -> 0 bytes
.../dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-77.ucode | Bin 1404840 -> 0 bytes
.../dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-77.ucode | Bin 1321956 -> 0 bytes
sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-77.ucode | Bin 1366144 -> 0 bytes
.../dev/iwlwififw/iwlwifi-gl-c0-fm-c0-83.ucode | Bin 1799504 -> 0 bytes
sys/contrib/dev/iwlwififw/iwlwifi-gl-c0-fm-c0.pnvm | Bin 226668 -> 0 bytes
.../dev/iwlwififw/iwlwifi-so-a0-gf-a0-83.ucode | Bin 1739988 -> 0 bytes
sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm | Bin 55580 -> 0 bytes
.../dev/iwlwififw/iwlwifi-so-a0-gf4-a0-83.ucode | Bin 1703968 -> 0 bytes
.../dev/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm | Bin 28064 -> 0 bytes
.../dev/iwlwififw/iwlwifi-so-a0-hr-b0-81.ucode | Bin 1539288 -> 0 bytes
.../dev/iwlwififw/iwlwifi-so-a0-jf-b0-77.ucode | Bin 1446036 -> 0 bytes
.../dev/iwlwififw/iwlwifi-ty-a0-gf-a0-83.ucode | Bin 1683076 -> 0 bytes
sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm | Bin 55484 -> 0 bytes
sys/modules/Makefile | 4 -
sys/modules/iwlwififw/Makefile | 31 --
sys/modules/iwlwififw/Makefile.inc | 19 -
sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile | 5 -
sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile | 5 -
sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile | 5 -
sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile | 5 -
sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile | 5 -
sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile | 5 -
sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile | 5 -
.../iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile | 5 -
.../iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile | 5 -
.../iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile | 5 -
.../iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile | 5 -
.../iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile | 5 -
.../iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile | 5 -
.../iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile | 5 -
.../iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile | 5 -
sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile | 5 -
.../iwlwififw/iwlwifi-gl-c0-fm-c0-fw/Makefile | 5 -
.../iwlwififw/iwlwifi-gl-c0-fm-c0-pnvm/Makefile | 7 -
.../iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile | 5 -
.../iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile | 7 -
.../iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile | 5 -
.../iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile | 7 -
.../iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile | 5 -
.../iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile | 5 -
.../iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile | 5 -
.../iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile | 7 -
61 files changed, 9 insertions(+), 721 deletions(-)
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 1ca9432d91d6..c608c15d32a3 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20250419: removal of iwlwifi firmware files
+OLD_FILES+=usr/share/doc/legal/intel_iwlwifi_firmware.LICENCE
+
# 20250310: caroot bundle updated
OLD_FILES+=usr/share/certs/trusted/Entrust_Root_Certification_Authority_-_G4.pem
OLD_FILES+=usr/share/certs/trusted/SecureSign_RootCA11.pem
diff --git a/UPDATING b/UPDATING
index 65c8b793a1ae..2e5dc88a49c4 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,12 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before updating system packages
and/or ports.
+20250419:
+ Intel iwlwifi firmware has been removed from the src repository.
+ Before updating their system, users of iwlwifi(4) or iwx(4) must
+ install the appropriate firmware for their chipset using fwget(8) or
+ building it from ports.
+
20250403:
Commit 8aedc83c1cc2 ("New setcred() system call and associated MAC
hooks") introduces new MAC hooks for the new setcred() system call,
diff --git a/share/doc/legal/Makefile b/share/doc/legal/Makefile
index 3a17e2f614e5..2030a2668900 100644
--- a/share/doc/legal/Makefile
+++ b/share/doc/legal/Makefile
@@ -1,7 +1,6 @@
SUBDIR= intel_ipw \
intel_iwi \
- intel_iwlwififw \
intel_iwn \
intel_wpi \
realtek \
diff --git a/share/doc/legal/intel_iwlwififw/Makefile b/share/doc/legal/intel_iwlwififw/Makefile
deleted file mode 100644
index 631d34654341..000000000000
--- a/share/doc/legal/intel_iwlwififw/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-
-FILES= ${SRCTOP}/sys/contrib/dev/iwlwififw/LICENCE.iwlwifi_firmware
-FILESDIR= ${SHAREDIR}/doc/legal
-FILESNAME= intel_iwlwifi_firmware.LICENCE
-
-.include <bsd.prog.mk>
diff --git a/sys/contrib/dev/iwlwififw/LICENCE.iwlwifi_firmware b/sys/contrib/dev/iwlwififw/LICENCE.iwlwifi_firmware
deleted file mode 100644
index 6bdd16d922b4..000000000000
--- a/sys/contrib/dev/iwlwififw/LICENCE.iwlwifi_firmware
+++ /dev/null
@@ -1,39 +0,0 @@
-Copyright (c) 2006-2021, Intel Corporation.
-All rights reserved.
-
-Redistribution. Redistribution and use in binary form, without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions must reproduce the above copyright notice and the
- following disclaimer in the documentation and/or other materials
- provided with the distribution.
-* Neither the name of Intel Corporation nor the names of its suppliers
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-* No reverse engineering, decompilation, or disassembly of this software
- is permitted.
-
-Limited patent license. Intel Corporation grants a world-wide,
-royalty-free, non-exclusive license under patents it now or hereafter
-owns or controls to make, have made, use, import, offer to sell and
-sell ("Utilize") this software, but solely to the extent that any
-such patent is necessary to Utilize the software alone, or in
-combination with an operating system licensed under an approved Open
-Source license as listed by the Open Source Initiative at
-http://opensource.org/licenses. The patent license shall not apply to
-any other combinations which include this software. No hardware per
-se is licensed hereunder.
-
-DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
diff --git a/sys/contrib/dev/iwlwififw/WHENCE b/sys/contrib/dev/iwlwififw/WHENCE
deleted file mode 100644
index ef6fbe552049..000000000000
--- a/sys/contrib/dev/iwlwififw/WHENCE
+++ /dev/null
@@ -1,483 +0,0 @@
-Driver: iwlwifi - Intel Wireless Wifi
-
-File: iwlwifi-3945-2.ucode
-Version: 15.32.2.9
-
-File: iwlwifi-4965-2.ucode
-Version: 228.61.2.24
-
-File: iwlwifi-5000-1.ucode
-Version: 5.4.A.11 (aka 5.4.1.16)
-
-File: iwlwifi-5000-2.ucode
-Version: 8.24.2.12
-
-File: iwlwifi-5000-5.ucode
-Version: 8.83.5.1
-
-File: iwlwifi-5150-2.ucode
-Version: 8.24.2.2
-
-File: iwlwifi-1000-3.ucode
-Version: 128.50.3.1
-
-File: iwlwifi-1000-5.ucode
-Version: 39.31.5.1
-
-File: iwlwifi-6000-4.ucode
-Version: 9.221.4.1
-
-File: iwlwifi-6050-4.ucode
-Version: 9.201.4.1
-
-File: iwlwifi-6050-5.ucode
-Version: 41.28.5.1
-
-File: iwlwifi-6000g2a-5.ucode
-Version: 17.168.5.3
-
-File: iwlwifi-6000g2a-6.ucode
-Version: 18.168.6.1
-
-File: iwlwifi-6000g2b-5.ucode
-Version: 17.168.5.1
-
-File: iwlwifi-6000g2b-6.ucode
-Version: 18.168.6.1
-
-File: iwlwifi-135-6.ucode
-Version: 18.168.6.1
-
-File: iwlwifi-100-5.ucode
-Version: 39.31.5.1
-
-File: iwlwifi-105-6.ucode
-Version: 18.168.6.1
-
-File: iwlwifi-2030-6.ucode
-Version: 18.168.6.1
-
-File: iwlwifi-2000-6.ucode
-Version: 18.168.6.1
-
-File: iwlwifi-7260-17.ucode
-Version: 17.bfb58538.0
-
-File: iwlwifi-3160-17.ucode
-Version: 17.bfb58538.0
-
-File: iwlwifi-7265-17.ucode
-Version: 17.bfb58538.0
-
-File: iwlwifi-7265D-22.ucode
-Version: 22.391740.0
-
-File: iwlwifi-7265D-27.ucode
-Version: 27.541033.0
-
-File: iwlwifi-7265D-29.ucode
-Version: 29.f2390aa8.0
-
-File: iwlwifi-3168-22.ucode
-Version: 22.391740.0
-
-File: iwlwifi-3168-27.ucode
-Version: 27.541033.0
-
-File: iwlwifi-3168-29.ucode
-Version: 29.0bd893f3.0
-
-File: iwlwifi-8000C-22.ucode
-Version: 22.391740.0
-
-File: iwlwifi-8000C-27.ucode
-Version: 27.541033.0
-
-File: iwlwifi-8000C-31.ucode
-Version: 31.560484.0
-
-File: iwlwifi-8000C-34.ucode
-Version: 34.610288.0
-
-File: iwlwifi-8000C-36.ucode
-Version: 36.ca7b901d.0
-
-File: iwlwifi-8265-22.ucode
-Version: 22.391740.0
-
-File: iwlwifi-8265-27.ucode
-Version: 27.541033.0
-
-File: iwlwifi-8265-31.ucode
-Version: 31.560484.0
-
-File: iwlwifi-8265-34.ucode
-Version: 34.610288.0
-
-File: iwlwifi-8265-36.ucode
-Version: 36.ca7b901d.0
-
-File: iwlwifi-9000-pu-b0-jf-b0-33.ucode
-Version: 33.610294.0
-
-File: iwlwifi-9000-pu-b0-jf-b0-34.ucode
-Version: 34.ba501b11.0
-
-File: iwlwifi-9000-pu-b0-jf-b0-38.ucode
-Version: 38.755cfdd8.0
-
-File: iwlwifi-9000-pu-b0-jf-b0-41.ucode
-Version: 41.fc1a7aea.0
-
-File: iwlwifi-9000-pu-b0-jf-b0-43.ucode
-Version: 43.95eb4e97.0
-
-File: iwlwifi-9000-pu-b0-jf-b0-46.ucode
-Version: 46.9d0122c0.0
-
-File: iwlwifi-9260-th-b0-jf-b0-33.ucode
-Version: 33.610294.0
-
-File: iwlwifi-9260-th-b0-jf-b0-34.ucode
-Version: 34.ba501b11.0
-
-File: iwlwifi-9260-th-b0-jf-b0-38.ucode
-Version: 38.755cfdd8.0
-
-File: iwlwifi-9260-th-b0-jf-b0-41.ucode
-Version: 41.fc1a7aea.0
-
-File: iwlwifi-9260-th-b0-jf-b0-43.ucode
-Version: 43.95eb4e97.0
-
-File: iwlwifi-9260-th-b0-jf-b0-46.ucode
-Version: 46.9d0122c0.0
-
-File: iwlwifi-cc-a0-46.ucode
-Version: 46.3cfab8da.0
-
-File: iwlwifi-cc-a0-48.ucode
-Version: 48.4fa0041f.0
-
-File: iwlwifi-Qu-b0-hr-b0-48.ucode
-Version: 48.4fa0041f.0
-
-File: iwlwifi-Qu-b0-jf-b0-48.ucode
-Version: 48.4fa0041f.0
-
-File: iwlwifi-Qu-c0-hr-b0-48.ucode
-Version: 48.4fa0041f.0
-
-File: iwlwifi-Qu-c0-jf-b0-48.ucode
-Version: 48.4fa0041f.0
-
-File: iwlwifi-QuZ-a0-hr-b0-48.ucode
-Version: 48.4fa0041f.0
-
-File: iwlwifi-QuZ-a0-jf-b0-48.ucode
-Version: 48.4fa0041f.0
-
-File: iwlwifi-cc-a0-50.ucode
-Version: 50.3e391d3e.0
-
-File: iwlwifi-Qu-b0-hr-b0-50.ucode
-Version: 50.3e391d3e.0
-
-File: iwlwifi-Qu-b0-jf-b0-50.ucode
-Version: 50.3e391d3e.0
-
-File: iwlwifi-Qu-c0-hr-b0-50.ucode
-Version: 50.3e391d3e.0
-
-File: iwlwifi-Qu-c0-jf-b0-50.ucode
-Version: 50.3e391d3e.0
-
-File: iwlwifi-QuZ-a0-hr-b0-50.ucode
-Version: 50.3e391d3e.0
-
-File: iwlwifi-QuZ-a0-jf-b0-50.ucode
-Version: 50.3e391d3e.0
-
-File: iwlwifi-cc-a0-53.ucode
-Version: 53.c31ac674.0
-
-File: iwlwifi-Qu-b0-hr-b0-53.ucode
-Version: 53.c31ac674.0
-
-File: iwlwifi-Qu-b0-jf-b0-53.ucode
-Version: 53.c31ac674.0
-
-File: iwlwifi-Qu-c0-hr-b0-53.ucode
-Version: 53.c31ac674.0
-
-File: iwlwifi-Qu-c0-jf-b0-53.ucode
-Version: 53.c31ac674.0
-
-File: iwlwifi-QuZ-a0-hr-b0-53.ucode
-Version: 53.c31ac674.0
-
-File: iwlwifi-QuZ-a0-jf-b0-53.ucode
-Version: 53.c31ac674.0
-
-File: iwlwifi-cc-a0-55.ucode
-Version: 55.d9698065.0
-
-File: iwlwifi-Qu-b0-hr-b0-55.ucode
-Version: 55.d9698065.0
-
-File: iwlwifi-Qu-b0-jf-b0-55.ucode
-Version: 55.d9698065.0
-
-File: iwlwifi-Qu-c0-hr-b0-55.ucode
-Version: 55.d9698065.0
-
-File: iwlwifi-Qu-c0-jf-b0-55.ucode
-Version: 55.d9698065.0
-
-File: iwlwifi-QuZ-a0-hr-b0-55.ucode
-Version: 55.d9698065.0
-
-File: iwlwifi-QuZ-a0-jf-b0-55.ucode
-Version: 55.d9698065.0
-
-File: iwlwifi-cc-a0-59.ucode
-Version: 59.601f3a66.0
-
-File: iwlwifi-Qu-b0-hr-b0-59.ucode
-Version: 59.601f3a66.0
-
-File: iwlwifi-Qu-b0-jf-b0-59.ucode
-Version: 59.601f3a66.0
-
-File: iwlwifi-Qu-c0-hr-b0-59.ucode
-Version: 59.601f3a66.0
-
-File: iwlwifi-Qu-c0-jf-b0-59.ucode
-Version: 59.601f3a66.0
-
-File: iwlwifi-QuZ-a0-hr-b0-59.ucode
-Version: 59.601f3a66.0
-
-File: iwlwifi-QuZ-a0-jf-b0-59.ucode
-Version: 59.601f3a66.0
-
-File: iwlwifi-so-a0-gf-a0-64.ucode
-Version: 64.97bbee0a.0
-
-File: iwlwifi-so-a0-gf-a0-67.ucode
-Version: 67.8f59b80b.0
-
-File: iwlwifi-so-a0-gf4-a0-67.ucode
-Version: 67.8f59b80b.0
-
-File: iwlwifi-so-a0-gf-a0.pnvm
-
-File: iwlwifi-so-a0-gf4-a0.pnvm
-
-File: iwlwifi-so-a0-hr-b0-64.ucode
-Version: 64.97bbee0a.0
-
-File: iwlwifi-so-a0-jf-b0-64.ucode
-Version: 64.97bbee0a.0
-
-File: iwlwifi-ty-a0-gf-a0-59.ucode
-Version: 59.601f3a66.0
-
-File: iwlwifi-cc-a0-62.ucode
-Version: 62.49eeb572.0
-
-File: iwlwifi-Qu-b0-hr-b0-62.ucode
-Version: 62.49eeb572.0
-
-File: iwlwifi-Qu-b0-jf-b0-62.ucode
-Version: 62.49eeb572.0
-
-File: iwlwifi-Qu-c0-hr-b0-62.ucode
-Version: 62.49eeb572.0
-
-File: iwlwifi-Qu-c0-jf-b0-62.ucode
-Version: 62.49eeb572.0
-
-File: iwlwifi-QuZ-a0-hr-b0-62.ucode
-Version: 62.49eeb572.0
-
-File: iwlwifi-QuZ-a0-jf-b0-62.ucode
-Version: 62.49eeb572.0
-
-File: iwlwifi-ty-a0-gf-a0-62.ucode
-Version: 62.49eeb572.0
-
-File: iwlwifi-cc-a0-63.ucode
-Version: 63.c04f3485.0
-
-File: iwlwifi-cc-a0-67.ucode
-Version: 67.8f59b80b.0
-
-File: iwlwifi-Qu-b0-hr-b0-63.ucode
-Version: 63.c04f3485.0
-
-File: iwlwifi-Qu-b0-jf-b0-63.ucode
-Version: 63.c04f3485.0
-
-File: iwlwifi-Qu-c0-hr-b0-63.ucode
-Version: 63.c04f3485.0
-
-File: iwlwifi-Qu-c0-jf-b0-63.ucode
-Version: 63.c04f3485.0
-
-File: iwlwifi-QuZ-a0-hr-b0-63.ucode
-Version: 63.c04f3485.0
-
-File: iwlwifi-QuZ-a0-hr-b0-67.ucode
-Version: 67.8f59b80b.0
-
-File: iwlwifi-QuZ-a0-jf-b0-63.ucode
-Version: 63.c04f3485.0
-
-File: iwlwifi-ty-a0-gf-a0-63.ucode
-Version: 63.c04f3485.0
-
-File: iwlwifi-cc-a0-66.ucode
-Version: 66.f1c864e0.0
-
-File: iwlwifi-Qu-b0-hr-b0-66.ucode
-Version: 66.f1c864e0.0
-
-File: iwlwifi-Qu-b0-jf-b0-66.ucode
-Version: 66.f1c864e0.0
-
-File: iwlwifi-Qu-c0-hr-b0-66.ucode
-Version: 66.f1c864e0.0
-
-File: iwlwifi-Qu-c0-jf-b0-66.ucode
-Version: 66.f1c864e0.0
-
-File: iwlwifi-QuZ-a0-hr-b0-66.ucode
-Version: 66.f1c864e0.0
-
-File: iwlwifi-QuZ-a0-jf-b0-66.ucode
-Version: 66.f1c864e0.0
-
-File: iwlwifi-ty-a0-gf-a0-66.ucode
-Version: 66.f1c864e0.0
-
-File: iwlwifi-ty-a0-gf-a0-67.ucode
-Version: 67.8f59b80b.0
-
-File: iwlwifi-cc-a0-68.ucode
-Version: 68.01d30b0c.0
-
-File: iwlwifi-Qu-b0-hr-b0-68.ucode
-Version: 68.01d30b0c.0
-
-File: iwlwifi-Qu-b0-jf-b0-68.ucode
-Version: 68.01d30b0c.0
-
-File: iwlwifi-Qu-c0-hr-b0-68.ucode
-Version: 68.01d30b0c.0
-
-File: iwlwifi-Qu-c0-jf-b0-68.ucode
-Version: 68.01d30b0c.0
-
-File: iwlwifi-QuZ-a0-hr-b0-68.ucode
-Version: 68.01d30b0c.0
-
-File: iwlwifi-QuZ-a0-jf-b0-68.ucode
-Version: 68.01d30b0c.0
-
-File: iwlwifi-ty-a0-gf-a0-68.ucode
-Version: 68.01d30b0c.0
-
-File: iwlwifi-so-a0-gf4-a0-68.ucode
-Version: 68.01d30b0c.0
-
-File: iwlwifi-so-a0-gf-a0-68.ucode
-Version: 68.01d30b0c.0
-
-File: iwlwifi-so-a0-hr-b0-68.ucode
-Version: 68.01d30b0c.0
-
-File: iwlwifi-so-a0-jf-b0-68.ucode
-Version: 68.01d30b0c.0
-
-File: iwlwifi-cc-a0-71.ucode
-Version: 71.058653f6.0
-
-File: iwlwifi-Qu-b0-hr-b0-71.ucode
-Version: 71.058653f6.0
-
-File: iwlwifi-Qu-b0-jf-b0-71.ucode
-Version: 71.058653f6.0
-
-File: iwlwifi-Qu-c0-hr-b0-71.ucode
-Version: 71.058653f6.0
-
-File: iwlwifi-Qu-c0-jf-b0-71.ucode
-Version: 71.058653f6.0
-
-File: iwlwifi-QuZ-a0-hr-b0-71.ucode
-Version: 71.058653f6.0
-
-File: iwlwifi-QuZ-a0-jf-b0-71.ucode
-Version: 71.058653f6.0
-
-File: iwlwifi-ty-a0-gf-a0-71.ucode
-Version: 71.058653f6.0
-
-File: iwlwifi-so-a0-gf4-a0-71.ucode
-Version: 71.058653f6.0
-
-File: iwlwifi-so-a0-gf-a0-71.ucode
-Version: 71.058653f6.0
-
-File: iwlwifi-so-a0-hr-b0-71.ucode
-Version: 71.058653f6.0
-
-File: iwlwifi-so-a0-jf-b0-71.ucode
-Version: 71.058653f6.0
-
-File: iwlwifi-cc-a0-73.ucode
-Version: 73.35c0a2c6.0
-
-File: iwlwifi-Qu-b0-hr-b0-73.ucode
-Version: 73.35c0a2c6.0
-
-File: iwlwifi-Qu-b0-jf-b0-73.ucode
-Version: 73.35c0a2c6.0
-
-File: iwlwifi-Qu-c0-hr-b0-73.ucode
-Version: 73.35c0a2c6.0
-
-File: iwlwifi-Qu-c0-jf-b0-73.ucode
-Version: 73.35c0a2c6.0
-
-File: iwlwifi-QuZ-a0-hr-b0-73.ucode
-Version: 73.35c0a2c6.0
-
-File: iwlwifi-QuZ-a0-jf-b0-73.ucode
-Version: 73.35c0a2c6.0
-
-File: iwlwifi-ty-a0-gf-a0-73.ucode
-Version: 73.35c0a2c6.0
-
-File: iwlwifi-so-a0-gf4-a0-73.ucode
-Version: 73.35c0a2c6.0
-
-File: iwlwifi-so-a0-gf-a0-73.ucode
-Version: 73.35c0a2c6.0
-
-File: iwlwifi-so-a0-hr-b0-73.ucode
-Version: 73.35c0a2c6.0
-
-File: iwlwifi-so-a0-jf-b0-73.ucode
-Version: 73.35c0a2c6.0
-
-File: iwlwifi-so-a0-gf-a0.pnvm
-
-File: iwlwifi-so-a0-gf4-a0.pnvm
-
-File: iwlwifi-ty-a0-gf-a0.pnvm
-
-Licence: Redistributable. See LICENCE.iwlwifi_firmware for details
-
-Also available from http://wireless.kernel.org/en/users/Drivers/iwlwifi#Firmware
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-3160-17.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-3160-17.ucode
deleted file mode 100644
index 95b26df9d56d..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-3160-17.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-3168-29.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-3168-29.ucode
deleted file mode 100644
index 1759561ec203..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-3168-29.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-7260-17.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-7260-17.ucode
deleted file mode 100644
index b1a87d52cdd1..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-7260-17.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-7265-17.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-7265-17.ucode
deleted file mode 100644
index f4a549cce6ed..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-7265-17.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-7265D-29.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-7265D-29.ucode
deleted file mode 100644
index 7c513f669790..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-7265D-29.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-8000C-36.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-8000C-36.ucode
deleted file mode 100644
index e4988f6b421e..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-8000C-36.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-8265-36.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-8265-36.ucode
deleted file mode 100644
index 60fda3b7d45b..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-8265-36.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode
deleted file mode 100644
index 9af424f1ce06..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode
deleted file mode 100644
index 4c2b25e585cb..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-77.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-77.ucode
deleted file mode 100644
index de6cd8b98985..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-77.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-77.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-77.ucode
deleted file mode 100644
index ad87490d470b..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-77.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-77.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-77.ucode
deleted file mode 100644
index 37e1c7af3f16..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-77.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-77.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-77.ucode
deleted file mode 100644
index bd0b2b249894..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-77.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-77.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-77.ucode
deleted file mode 100644
index 256997390af6..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-77.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-77.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-77.ucode
deleted file mode 100644
index 7c2a06a2dd2e..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-77.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-77.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-77.ucode
deleted file mode 100644
index d138e34af24d..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-77.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-gl-c0-fm-c0-83.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-gl-c0-fm-c0-83.ucode
deleted file mode 100644
index a1444bab2622..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-gl-c0-fm-c0-83.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-gl-c0-fm-c0.pnvm b/sys/contrib/dev/iwlwififw/iwlwifi-gl-c0-fm-c0.pnvm
deleted file mode 100644
index 3cdb0b522b22..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-gl-c0-fm-c0.pnvm and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0-83.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0-83.ucode
deleted file mode 100644
index dbb15f487716..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0-83.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm
deleted file mode 100644
index 9dad35a1f5f5..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0-83.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0-83.ucode
deleted file mode 100644
index 1bc07d83ac07..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0-83.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm
deleted file mode 100644
index 86b9a7c63776..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-hr-b0-81.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-hr-b0-81.ucode
deleted file mode 100644
index fc8558c6cc90..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-hr-b0-81.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-jf-b0-77.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-jf-b0-77.ucode
deleted file mode 100644
index 3649a1c89238..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-jf-b0-77.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0-83.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0-83.ucode
deleted file mode 100644
index 3fdd6d5a0d9a..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0-83.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm b/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm
deleted file mode 100644
index 68b8668df93d..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm and /dev/null differ
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index c7015c61c705..1db14cfa647d 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -194,7 +194,6 @@ SUBDIR= \
${_iwi} \
${_iwifw} \
${_iwlwifi} \
- ${_iwlwififw} \
${_iwm} \
${_iwmfw} \
${_iwn} \
@@ -567,9 +566,6 @@ _mlx5ib= mlx5ib
_ena= ena
_gve= gve
_iwlwifi= iwlwifi
-.if ${MK_SOURCELESS_UCODE} != "no"
-_iwlwififw= iwlwififw
-.endif
_rtw88= rtw88
.if ${MK_SOURCELESS_UCODE} != "no"
_rtw88fw= rtw88fw
diff --git a/sys/modules/iwlwififw/Makefile b/sys/modules/iwlwififw/Makefile
deleted file mode 100644
index 756fb2f73af7..000000000000
--- a/sys/modules/iwlwififw/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-
-SUBDIR= \
- iwlwifi-3160-fw \
- iwlwifi-3168-fw \
- iwlwifi-7260-fw \
- iwlwifi-7265-fw \
- iwlwifi-7265D-fw \
- iwlwifi-8000C-fw \
- iwlwifi-8265-fw \
- iwlwifi-9000-pu-b0-jf-b0-fw \
- iwlwifi-9260-th-b0-jf-b0-fw \
- iwlwifi-Qu-b0-hr-b0-fw \
- iwlwifi-Qu-b0-jf-b0-fw \
- iwlwifi-Qu-c0-hr-b0-fw \
- iwlwifi-Qu-c0-jf-b0-fw \
- iwlwifi-QuZ-a0-hr-b0-fw \
- iwlwifi-QuZ-a0-jf-b0-fw \
- iwlwifi-cc-a0-fw \
- iwlwifi-gl-c0-fm-c0-fw \
- iwlwifi-gl-c0-fm-c0-pnvm \
- iwlwifi-so-a0-gf-a0-fw \
- iwlwifi-so-a0-gf4-a0-fw \
- iwlwifi-so-a0-hr-b0-fw \
- iwlwifi-so-a0-jf-b0-fw \
- iwlwifi-ty-a0-gf-a0-fw \
- iwlwifi-so-a0-gf-a0-pnvm \
- iwlwifi-so-a0-gf4-a0-pnvm \
- iwlwifi-ty-a0-gf-a0-pnvm
-
-
-.include <bsd.subdir.mk>
diff --git a/sys/modules/iwlwififw/Makefile.inc b/sys/modules/iwlwififw/Makefile.inc
deleted file mode 100644
index ea3e88783809..000000000000
--- a/sys/modules/iwlwififw/Makefile.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# Common rules for building iwlwifi firmware.
-
-EXT?= ucode
-_NAME?= iwlwifi-${NAME}-${FWVERSION}.${EXT}
-
-IMG= ${_NAME}
-KMOD= ${_NAME}
-
-CLEANFILES+= ${IMG}
-
-FIRMWS= ${IMG}:${IMG}:${FWVERSION}
-
-# License ack is not needed for iwlwifi (same as iwn/iwm).
-#FIRMWARE_LICENSE=
-
-${IMG}: ${SRCTOP}/sys/contrib/dev/iwlwififw/${IMG}
- cp ${.ALLSRC} ${.TARGET}
-
diff --git a/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile
deleted file mode 100644
index 69d537c89754..000000000000
--- a/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-FWVERSION= 17
-NAME= 3160
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile
deleted file mode 100644
index 2e98c2148a79..000000000000
--- a/sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-FWVERSION= 29
-NAME= 3168
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile
deleted file mode 100644
index befd607a269e..000000000000
--- a/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-FWVERSION= 17
-NAME= 7260
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile
deleted file mode 100644
index 42d7c508dd1b..000000000000
--- a/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-FWVERSION= 17
-NAME= 7265
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile
deleted file mode 100644
index 37af2799e1eb..000000000000
--- a/sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-FWVERSION= 29
-NAME= 7265D
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile
deleted file mode 100644
index 0b3efe221d08..000000000000
--- a/sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-FWVERSION= 36
-NAME= 8000C
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile
deleted file mode 100644
index 5f238c8aa619..000000000000
--- a/sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-FWVERSION= 36
-NAME= 8265
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile
deleted file mode 100644
index 03b5d5d142d2..000000000000
--- a/sys/modules/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-FWVERSION= 46
-NAME= 9000-pu-b0-jf-b0
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile
deleted file mode 100644
index 37ae25a4a836..000000000000
--- a/sys/modules/iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-
-FWVERSION= 46
-NAME= 9260-th-b0-jf-b0
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile
deleted file mode 100644
index e781e790a048..000000000000
*** 192 LINES SKIPPED ***