diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 14f54d75bc1..24455bb8614 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20250409: removal of iwlwifi firmware files +OLD_FILES+=usr/share/doc/legal/intel_iwlwifi_firmware.LICENCE + # 20250331: removal of TCPPCAP OLD_FILES+=usr/include/netinet/tcp_pcap.h diff --git a/UPDATING b/UPDATING index 56b5e2dc16b..8f709a0f1de 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20250409: + 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 as Intel iwlwifi firmware has been removed + from the src repository. + 20250314: We now use LLVM's binary utilities (nm, objcopy, etc.) by default. The WITHOUT_LLVM_BINUTILS src.conf(5) knob can be used to revert to diff --git a/share/doc/legal/Makefile b/share/doc/legal/Makefile index 9467a4ece9a..a4ac98c4d30 100644 --- a/share/doc/legal/Makefile +++ b/share/doc/legal/Makefile @@ -1,6 +1,5 @@ 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 87956f8e7a3..00000000000 --- a/share/doc/legal/intel_iwlwififw/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -FILES= ${SRCTOP}/sys/contrib/dev/iwlwififw/LICENCE.iwlwifi_firmware -FILESDIR= ${SHAREDIR}/doc/legal -FILESNAME= intel_iwlwifi_firmware.LICENCE - -.include diff --git a/sys/contrib/dev/iwlwififw/LICENCE.iwlwifi_firmware b/sys/contrib/dev/iwlwififw/LICENCE.iwlwifi_firmware deleted file mode 100644 index 6bdd16d922b..00000000000 --- 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 ef6fbe55204..00000000000 --- 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 95b26df9d56..00000000000 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 1759561ec20..00000000000 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 b1a87d52cdd..00000000000 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 f4a549cce6e..00000000000 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 7c513f66979..00000000000 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 e4988f6b421..00000000000 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 60fda3b7d45..00000000000 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 9af424f1ce0..00000000000 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 4c2b25e585c..00000000000 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 de6cd8b9898..00000000000 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 ad87490d470..00000000000 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 37e1c7af3f1..00000000000 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 bd0b2b24989..00000000000 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 256997390af..00000000000 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 7c2a06a2dd2..00000000000 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 d138e34af24..00000000000 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 a1444bab262..00000000000 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 3cdb0b522b2..00000000000 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 dbb15f48771..00000000000 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 9dad35a1f5f..00000000000 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 1bc07d83ac0..00000000000 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 86b9a7c6377..00000000000 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 fc8558c6cc9..00000000000 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 3649a1c8923..00000000000 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 3fdd6d5a0d9..00000000000 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 68b8668df93..00000000000 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 71193e3559b..1608e47891e 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -196,7 +196,6 @@ SUBDIR= \ ${_iwi} \ ${_iwifw} \ ${_iwlwifi} \ - ${_iwlwififw} \ ${_iwm} \ ${_iwn} \ ${_iwnfw} \ @@ -571,9 +570,6 @@ _mlx5ib= mlx5ib _ena= ena _gve= gve _iwlwifi= iwlwifi -.if ${MK_SOURCELESS_UCODE} != "no" -_iwlwififw= iwlwififw -.endif _rtw88= rtw88 _rtw89= rtw89 _vmware= vmware diff --git a/sys/modules/iwlwififw/Makefile b/sys/modules/iwlwififw/Makefile deleted file mode 100644 index dcecb2072d0..00000000000 --- a/sys/modules/iwlwififw/Makefile +++ /dev/null @@ -1,30 +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 diff --git a/sys/modules/iwlwififw/Makefile.inc b/sys/modules/iwlwififw/Makefile.inc deleted file mode 100644 index 1fe51a087f5..00000000000 --- a/sys/modules/iwlwififw/Makefile.inc +++ /dev/null @@ -1,18 +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 22817a07053..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 17 -NAME= 3160 - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile deleted file mode 100644 index 8f5ab6a1511..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 29 -NAME= 3168 - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile deleted file mode 100644 index d18dca802cb..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 17 -NAME= 7260 - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile deleted file mode 100644 index 3058f7e26d2..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 17 -NAME= 7265 - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile deleted file mode 100644 index 30d1788fa0b..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 29 -NAME= 7265D - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile deleted file mode 100644 index d0e9113028b..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 36 -NAME= 8000C - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile deleted file mode 100644 index 344c76d69db..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 36 -NAME= 8265 - -.include 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 4475367933e..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 46 -NAME= 9000-pu-b0-jf-b0 - -.include 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 b33ac5a53f7..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 46 -NAME= 9260-th-b0-jf-b0 - -.include 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 d991ff20e09..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 77 -NAME= Qu-b0-hr-b0 - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile deleted file mode 100644 index 2876476060b..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 77 -NAME= Qu-b0-jf-b0 - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile deleted file mode 100644 index dc3f899e52c..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 77 -NAME= Qu-c0-hr-b0 - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile deleted file mode 100644 index 3d8ab9d436a..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 77 -NAME= Qu-c0-jf-b0 - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile deleted file mode 100644 index 387813717cd..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 77 -NAME= QuZ-a0-hr-b0 - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile deleted file mode 100644 index b4198a3068b..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 77 -NAME= QuZ-a0-jf-b0 - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile deleted file mode 100644 index b6949c29c30..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 77 -NAME= cc-a0 - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-fw/Makefile deleted file mode 100644 index e44c7c406e8..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 83 -NAME= gl-c0-fm-c0 - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-pnvm/Makefile deleted file mode 100644 index 4fc1b42284d..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-pnvm/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -FWVERSION= 83 -NAME= gl-c0-fm-c0 -EXT= pnvm -_NAME= iwlwifi-${NAME}.${EXT} - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile deleted file mode 100644 index 5c1d26d1e8c..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 83 -NAME= so-a0-gf-a0 - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile deleted file mode 100644 index bf14a597c5b..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -FWVERSION= 83 -NAME= so-a0-gf-a0 -EXT= pnvm -_NAME= iwlwifi-${NAME}.${EXT} - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile deleted file mode 100644 index c75525c620e..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 83 -NAME= so-a0-gf4-a0 - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile deleted file mode 100644 index 49eae25d5e5..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -FWVERSION= 83 -NAME= so-a0-gf4-a0 -EXT= pnvm -_NAME= iwlwifi-${NAME}.${EXT} - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile deleted file mode 100644 index 4c056fcfd3c..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 81 -NAME= so-a0-hr-b0 - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile deleted file mode 100644 index 1ffc42d0ea1..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 77 -NAME= so-a0-jf-b0 - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile deleted file mode 100644 index 032c3a9d217..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -FWVERSION= 83 -NAME= ty-a0-gf-a0 - -.include diff --git a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile deleted file mode 100644 index 83a7b625d64..00000000000 --- a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -FWVERSION= 83 -NAME= ty-a0-gf-a0 -EXT= pnvm -_NAME= iwlwifi-${NAME}.${EXT} - -.include