aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern A. Zeeb <bz@FreeBSD.org>2025-12-08 03:03:14 +0000
committerBjoern A. Zeeb <bz@FreeBSD.org>2025-12-08 03:16:00 +0000
commitf0ea859229843affe07ac94db915489756f87096 (patch)
treeb6fe21203ca8ef040cfad104dce3c8e335397fcb
parent8b78d412aec7f9171ecc2e1cd8aea07b19b4f600 (diff)
iwmfw(4): fix spelling of the iwm8000C firmware.
When migrating the firmware to be installed as plain firmware files to /boot/firmware the iwm8000C firmware lost its "fw" suffix that iwm(4) expects. The follow-up change to defaults/loader.conf is also consistently missing the "fw". Fix both places, and add the wrongly spelt version to ObsoleteFiles.inc (entirely untested). PR: 291403 Reported by: Augustin Hoffmann (avgwst tutanota.de) Fixes: af0a81b6470aba4af4a24ae9804053722846ded4 Fixes: a0f06dfb0d188966bee7265ec7d9f20093186bb6 MFC after: 3 days
-rw-r--r--ObsoleteFiles.inc3
-rw-r--r--share/firmwares/iwm/Makefile2
-rw-r--r--stand/defaults/loader.conf2
3 files changed, 5 insertions, 2 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 96af7d6205b5..1e7271c39385 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20251208: Rename iwm8000C to correct name.
+OLD_FILES+=boot/firmware/iwm8000C
+
# 20251207: removed libuutil and libtpool
OLD_LIBS+= lib/libuutil.so.2
OLD_LIBS+= lib/libtpool.so.2
diff --git a/share/firmwares/iwm/Makefile b/share/firmwares/iwm/Makefile
index c44f401c315e..0a242513fa3d 100644
--- a/share/firmwares/iwm/Makefile
+++ b/share/firmwares/iwm/Makefile
@@ -41,7 +41,7 @@ iwm7265DMODE= 644
iwm7265DPACKAGE= firmware-iwm
iwm8000C= ${SRCTOP}/sys/contrib/dev/iwm/iwm-8000C-22.fw
-iwm8000CNAME= iwm8000C
+iwm8000CNAME= iwm8000Cfw
iwm8000CDIR= /boot/firmware
iwm8000CMODE= 644
iwm8000CPACKAGE= firmware-iwm
diff --git a/stand/defaults/loader.conf b/stand/defaults/loader.conf
index 036479d22285..71fb052cd21b 100644
--- a/stand/defaults/loader.conf
+++ b/stand/defaults/loader.conf
@@ -195,5 +195,5 @@ iwm8265fw_type="firmware"
iwm9260fw_type="firmware"
iwm3168fw_type="firmware"
iwm7265Dfw_type="firmware"
-iwm8000C_type="firmware"
+iwm8000Cfw_type="firmware"
iwm9000fw_type="firmware"