Module Name: src
Committed By: mrg
Date: Sun May 15 00:24:14 UTC 2022
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/gpufw: mi
src/etc/mtree: NetBSD.dist.i386 NetBSD.dist.x86_64
src/external/amdgpu-firmware: Makefile
Added Files:
src/etc/mtree: NetBSD.dist.aarch64
Log Message:
install the lower case radeon firmware files into /usr/libdata/firmware.
radeon has different case but same name firmware files. the lower case
ones are already installed into /libdata/firmware, and to avoid having
to provide some special method to build on systems with case-preserving
file systems (such as macOS), we install the lower case ones in /usr.
this means that anyone that requires the lower case files must either
have /usr as part of the / file system, or manually keep them updated.
last part of PR#54976, though i doubt we'll try to pull up these.
this is enabled on i386, amd64 and arm64.
To generate a diff of this commit:
cvs rdiff -u -r1.1297 -r1.1298 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/gpufw/mi
cvs rdiff -u -r0 -r1.8 src/etc/mtree/NetBSD.dist.aarch64
cvs rdiff -u -r1.2 -r1.3 src/etc/mtree/NetBSD.dist.i386
cvs rdiff -u -r1.14 -r1.15 src/etc/mtree/NetBSD.dist.x86_64
cvs rdiff -u -r1.1 -r1.2 src/external/amdgpu-firmware/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1297 src/distrib/sets/lists/base/mi:1.1298
--- src/distrib/sets/lists/base/mi:1.1297 Sat May 14 17:52:10 2022
+++ src/distrib/sets/lists/base/mi Sun May 15 00:24:14 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1297 2022/05/14 17:52:10 uwe Exp $
+# $NetBSD: mi,v 1.1298 2022/05/15 00:24:14 mrg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1265,161 +1265,6 @@
./usr/libdata/firmware/bcm43xx base-firmware-usr
./usr/libdata/firmware/bcm43xx/BCM43430A1.hcd base-firmware-usr firmware
./usr/libdata/firmware/bcm43xx/LICENCE.broadcom_bcm43xx base-firmware-usr firmware
-./usr/libdata/firmware/radeon base-obsolete obsolete
-./usr/libdata/firmware/radeon/ARUBA_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/ARUBA_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/ARUBA_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BARTS_mc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BARTS_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BARTS_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BARTS_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_mc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_mc2.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_mec.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_sdma.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_uvd.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_vce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BTC_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/CAICOS_mc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/CAICOS_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/CAICOS_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/CAICOS_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/CAYMAN_mc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/CAYMAN_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/CAYMAN_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/CAYMAN_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/CAYMAN_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/CEDAR_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/CEDAR_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/CEDAR_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/CEDAR_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/CYPRESS_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/CYPRESS_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/CYPRESS_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/CYPRESS_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/CYPRESS_uvd.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAINAN_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAINAN_mc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAINAN_mc2.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAINAN_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAINAN_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAINAN_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAINAN_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAWAII_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAWAII_mc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAWAII_mc2.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAWAII_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAWAII_mec.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAWAII_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAWAII_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAWAII_sdma.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAWAII_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/JUNIPER_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/JUNIPER_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/JUNIPER_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/JUNIPER_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KABINI_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KABINI_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KABINI_mec.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KABINI_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KABINI_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KABINI_sdma.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KAVERI_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KAVERI_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KAVERI_mec.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KAVERI_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KAVERI_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KAVERI_sdma.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/MULLINS_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/MULLINS_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/MULLINS_mec.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/MULLINS_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/MULLINS_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/MULLINS_sdma.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/OLAND_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/OLAND_mc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/OLAND_mc2.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/OLAND_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/OLAND_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/OLAND_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/OLAND_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/PALM_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/PALM_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_mc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_mc2.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/R100_cp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/R200_cp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/R300_cp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/R420_cp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/R520_cp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/R600_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/R600_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/R600_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/R700_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/REDWOOD_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/REDWOOD_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/REDWOOD_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/REDWOOD_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RS600_cp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RS690_cp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RS780_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RS780_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV610_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV610_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV620_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV620_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV630_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV630_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV635_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV635_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV670_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV670_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV710_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV710_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV710_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV710_uvd.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV730_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV730_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV730_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV740_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV770_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV770_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/RV770_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/SUMO2_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/SUMO2_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/SUMO_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/SUMO_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/SUMO_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/SUMO_uvd.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TAHITI_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TAHITI_mc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TAHITI_mc2.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TAHITI_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TAHITI_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TAHITI_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TAHITI_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TAHITI_uvd.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TURKS_mc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TURKS_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TURKS_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TURKS_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/VERDE_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/VERDE_mc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/VERDE_mc2.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/VERDE_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/VERDE_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/VERDE_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/VERDE_smc.bin base-obsolete obsolete
./usr/libdata/ldscripts base-c-usr
./usr/libdata/lint base-c-usr
./usr/libdata/lint/strict-bool base-c-usr
Index: src/distrib/sets/lists/gpufw/mi
diff -u src/distrib/sets/lists/gpufw/mi:1.6 src/distrib/sets/lists/gpufw/mi:1.7
--- src/distrib/sets/lists/gpufw/mi:1.6 Tue Dec 14 12:13:38 2021
+++ src/distrib/sets/lists/gpufw/mi Sun May 15 00:24:14 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.6 2021/12/14 12:13:38 maya Exp $
+# $NetBSD: mi,v 1.7 2022/05/15 00:24:14 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -945,7 +945,7 @@
./libdata/firmware/radeon/VERDE_pfp.bin base-gpufw radeonfirmware
./libdata/firmware/radeon/VERDE_rlc.bin base-gpufw radeonfirmware
./libdata/firmware/radeon/VERDE_smc.bin base-gpufw radeonfirmware
-./usr/libdata/firmware/radeon base-obsolete obsolete
+./usr/libdata/firmware/radeon base-gpufw
./usr/libdata/firmware/radeon/ARUBA_me.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/ARUBA_pfp.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/ARUBA_rlc.bin base-obsolete obsolete
@@ -953,17 +953,6 @@
./usr/libdata/firmware/radeon/BARTS_me.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/BARTS_pfp.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/BARTS_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_mc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_mc2.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_mec.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_sdma.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_uvd.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/BONAIRE_vce.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/BTC_rlc.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/CAICOS_mc.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/CAICOS_me.bin base-obsolete obsolete
@@ -983,60 +972,12 @@
./usr/libdata/firmware/radeon/CYPRESS_rlc.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/CYPRESS_smc.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/CYPRESS_uvd.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAINAN_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAINAN_mc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAINAN_mc2.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAINAN_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAINAN_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAINAN_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAINAN_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAWAII_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAWAII_mc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAWAII_mc2.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAWAII_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAWAII_mec.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAWAII_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAWAII_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAWAII_sdma.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/HAWAII_smc.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/JUNIPER_me.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/JUNIPER_pfp.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/JUNIPER_rlc.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/JUNIPER_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KABINI_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KABINI_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KABINI_mec.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KABINI_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KABINI_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KABINI_sdma.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KAVERI_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KAVERI_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KAVERI_mec.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KAVERI_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KAVERI_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/KAVERI_sdma.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/MULLINS_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/MULLINS_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/MULLINS_mec.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/MULLINS_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/MULLINS_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/MULLINS_sdma.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/OLAND_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/OLAND_mc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/OLAND_mc2.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/OLAND_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/OLAND_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/OLAND_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/OLAND_smc.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/PALM_me.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/PALM_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_mc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_mc2.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/PITCAIRN_smc.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/R100_cp.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/R200_cp.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/R300_cp.bin base-obsolete obsolete
@@ -1081,23 +1022,97 @@
./usr/libdata/firmware/radeon/SUMO_pfp.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/SUMO_rlc.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/SUMO_uvd.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TAHITI_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TAHITI_mc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TAHITI_mc2.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TAHITI_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TAHITI_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TAHITI_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TAHITI_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/TAHITI_uvd.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/TURKS_mc.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/TURKS_me.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/TURKS_pfp.bin base-obsolete obsolete
./usr/libdata/firmware/radeon/TURKS_smc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/VERDE_ce.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/VERDE_mc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/VERDE_mc2.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/VERDE_me.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/VERDE_pfp.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/VERDE_rlc.bin base-obsolete obsolete
-./usr/libdata/firmware/radeon/VERDE_smc.bin base-obsolete obsolete
+./usr/libdata/firmware/radeon/banks_k_2_smc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/bonaire_ce.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/bonaire_k_smc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/bonaire_mc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/bonaire_me.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/bonaire_mec.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/bonaire_pfp.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/bonaire_rlc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/bonaire_sdma.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/bonaire_sdma1.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/bonaire_smc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/bonaire_uvd.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/bonaire_vce.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hainan_ce.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hainan_k_smc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hainan_mc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hainan_me.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hainan_pfp.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hainan_rlc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hainan_smc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hawaii_ce.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hawaii_k_smc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hawaii_mc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hawaii_me.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hawaii_mec.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hawaii_pfp.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hawaii_rlc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hawaii_sdma.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hawaii_sdma1.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hawaii_smc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hawaii_uvd.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/hawaii_vce.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kabini_ce.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kabini_me.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kabini_mec.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kabini_pfp.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kabini_rlc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kabini_sdma.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kabini_sdma1.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kabini_uvd.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kabini_vce.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kaveri_ce.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kaveri_me.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kaveri_mec.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kaveri_mec2.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kaveri_pfp.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kaveri_rlc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kaveri_sdma.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kaveri_sdma1.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kaveri_uvd.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/kaveri_vce.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/mullins_ce.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/mullins_me.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/mullins_mec.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/mullins_pfp.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/mullins_rlc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/mullins_sdma.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/mullins_sdma1.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/mullins_uvd.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/mullins_vce.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/oland_ce.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/oland_k_smc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/oland_mc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/oland_me.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/oland_pfp.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/oland_rlc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/oland_smc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/pitcairn_ce.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/pitcairn_k_smc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/pitcairn_mc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/pitcairn_me.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/pitcairn_pfp.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/pitcairn_rlc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/pitcairn_smc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/si58_mc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/tahiti_ce.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/tahiti_k_smc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/tahiti_mc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/tahiti_me.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/tahiti_pfp.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/tahiti_rlc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/tahiti_smc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/verde_ce.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/verde_k_smc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/verde_mc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/verde_me.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/verde_pfp.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/verde_rlc.bin base-gpufw radeonfirmware
+./usr/libdata/firmware/radeon/verde_smc.bin base-gpufw radeonfirmware
./var/db/obsolete/gpufw base-gpufw
Index: src/etc/mtree/NetBSD.dist.i386
diff -u src/etc/mtree/NetBSD.dist.i386:1.2 src/etc/mtree/NetBSD.dist.i386:1.3
--- src/etc/mtree/NetBSD.dist.i386:1.2 Tue Mar 12 10:07:49 2019
+++ src/etc/mtree/NetBSD.dist.i386 Sun May 15 00:24:14 2022
@@ -1,4 +1,5 @@
-# $NetBSD: NetBSD.dist.i386,v 1.2 2019/03/12 10:07:49 mrg Exp $
+# $NetBSD: NetBSD.dist.i386,v 1.3 2022/05/15 00:24:14 mrg Exp $
./usr/include/x86
./usr/include/xen
+./usr/libdata/firmware/radeon
Index: src/etc/mtree/NetBSD.dist.x86_64
diff -u src/etc/mtree/NetBSD.dist.x86_64:1.14 src/etc/mtree/NetBSD.dist.x86_64:1.15
--- src/etc/mtree/NetBSD.dist.x86_64:1.14 Tue Mar 12 10:07:49 2019
+++ src/etc/mtree/NetBSD.dist.x86_64 Sun May 15 00:24:14 2022
@@ -1,7 +1,8 @@
-# $NetBSD: NetBSD.dist.x86_64,v 1.14 2019/03/12 10:07:49 mrg Exp $
+# $NetBSD: NetBSD.dist.x86_64,v 1.15 2022/05/15 00:24:14 mrg Exp $
./usr/include/dev/nvmm
./usr/include/dev/nvmm/x86
./usr/include/i386
./usr/include/x86
./usr/include/xen
+./usr/libdata/firmware/radeon
Index: src/external/amdgpu-firmware/Makefile
diff -u src/external/amdgpu-firmware/Makefile:1.1 src/external/amdgpu-firmware/Makefile:1.2
--- src/external/amdgpu-firmware/Makefile:1.1 Sun Dec 12 20:33:22 2021
+++ src/external/amdgpu-firmware/Makefile Sun May 15 00:24:14 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/12/12 20:33:22 maya Exp $
+# $NetBSD: Makefile,v 1.2 2022/05/15 00:24:14 mrg Exp $
.include <bsd.own.mk>
@@ -6,4 +6,8 @@
SUBDIR+= amdgpu
.endif
+.if ${MKRADEONFIRMWARE} != "no"
+SUBDIR+= radeon
+.endif
+
.include <bsd.subdir.mk>
Added files:
Index: src/etc/mtree/NetBSD.dist.aarch64
diff -u /dev/null src/etc/mtree/NetBSD.dist.aarch64:1.8
--- /dev/null Sun May 15 00:24:14 2022
+++ src/etc/mtree/NetBSD.dist.aarch64 Sun May 15 00:24:14 2022
@@ -0,0 +1,5 @@
+# $NetBSD: NetBSD.dist.aarch64,v 1.8 2022/05/15 00:24:14 mrg Exp $
+
+./usr/include/aarch64
+./usr/include/arm
+./usr/libdata/firmware/radeon
