tech-kern archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[PATCH] Move DRM-driver firmware from base to its own set, gpufw
This set is only installed on amd64,i386,evbarm.
This set is installed on minimal installs and on install media, in
case someone needs it for basic driver functionality.
Comments:
Switched to a single MK tunable for it - that is probably unneeded.
Might be an issue for not obsoleting directories on non-DRM archs.
An upcoming DRM update will include even fatter firmware, and we'd
like to minimize the impact of it.
---
distrib/amd64/cdroms/Makefile.cdrom | 2 +-
distrib/common/bootimage/Makefile.bootimage | 6 +-
.../common/bootimage/Makefile.installimage | 3 +
distrib/i386/cdroms/Makefile.cdrom | 2 +-
distrib/notes/amd64/contents | 3 +
distrib/notes/evbarm/contents | 3 +
distrib/notes/i386/contents | 3 +
distrib/sets/README | 2 +
distrib/sets/lists/base/mi | 167 ---------
distrib/sets/lists/gpufw/mi | 328 ++++++++++++++++++
distrib/sets/maketars | 2 +-
distrib/sets/regpkgset | 2 +-
distrib/sets/sets.subr | 7 +-
distrib/utils/embedded/mkimage | 2 +-
etc/Makefile | 3 +
external/nvidia-firmware/Makefile | 2 +-
share/mk/bsd.README | 8 +-
share/mk/bsd.own.mk | 16 +-
sys/dev/microcode/radeon/Makefile | 2 +-
usr.sbin/sysinst/Makefile.inc | 4 +
usr.sbin/sysinst/arch/amd64/md.h | 2 +-
usr.sbin/sysinst/arch/evbarm/md.h | 2 +-
usr.sbin/sysinst/arch/i386/md.h | 2 +-
usr.sbin/sysinst/defs.h | 11 +-
usr.sbin/sysinst/msg.mi.de | 3 +
usr.sbin/sysinst/msg.mi.en | 3 +
usr.sbin/sysinst/msg.mi.es | 3 +
usr.sbin/sysinst/msg.mi.fr | 3 +
usr.sbin/sysinst/msg.mi.pl | 3 +
usr.sbin/sysinst/util.c | 3 +
30 files changed, 405 insertions(+), 197 deletions(-)
create mode 100644 distrib/sets/lists/gpufw/mi
diff --git a/distrib/amd64/cdroms/Makefile.cdrom b/distrib/amd64/cdroms/Makefile.cdrom
index 5021aed04814..c8f6ec632250 100644
--- a/distrib/amd64/cdroms/Makefile.cdrom
+++ b/distrib/amd64/cdroms/Makefile.cdrom
@@ -17,7 +17,7 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot,allow-multidot,bo
CDINSTKERNEL= ../../instkernel
CDKERNELS= netbsd-GENERIC.gz netbsd
CDRELEASE_NOISOS= true
-CD_SETS= base etc
+CD_SETS= base etc gpufw
.if ${MKKMOD} != "no"
CD_SETS+= modules
.endif
diff --git a/distrib/common/bootimage/Makefile.bootimage b/distrib/common/bootimage/Makefile.bootimage
index 8e4875cb0c7f..744ca216922e 100644
--- a/distrib/common/bootimage/Makefile.bootimage
+++ b/distrib/common/bootimage/Makefile.bootimage
@@ -71,8 +71,8 @@
# (default: kern-GENERIC)
# SETS
# binary sets that should be extracted into image
-# (default: modules base etc comp games man misc rescue tests
-# text xbase xcomp xetc xfont xserver)
+# (default: modules base etc comp games gpufw man misc
+# rescue tests text xbase xcomp xetc xfont xserver)
# SETS_DIR
# directory path where binary sets are stored
# (default: ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets)
@@ -234,7 +234,7 @@ SWAPDISK_UUID=`${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} show -i 3 | ${TOOL_AWK}
#
# definitions to create root fs
#
-SETS_DEFAULT= modules base etc comp games man misc rescue tests text
+SETS_DEFAULT= modules base etc comp games gpufw man misc rescue tests text
.if ${MKX11} != "no"
SETS_DEFAULT+= xbase xcomp xetc xfont xserver
.endif
diff --git a/distrib/common/bootimage/Makefile.installimage b/distrib/common/bootimage/Makefile.installimage
index 32bd54dab6cc..5d275c83acc4 100644
--- a/distrib/common/bootimage/Makefile.installimage
+++ b/distrib/common/bootimage/Makefile.installimage
@@ -33,6 +33,9 @@ SWAPMB= 0 # no swap
KERN_SET?= kern-GENERIC
SETS?= modules base etc
+.if ${MKGPUFIRMWARE:Uno} != "no"
+SETS+= gpufw
+.endif
FSTAB_IN?= ${NETBSDSRCDIR}/distrib/common/bootimage/fstab.install.in
diff --git a/distrib/i386/cdroms/Makefile.cdrom b/distrib/i386/cdroms/Makefile.cdrom
index bec0ea3b9341..4a01c8e2ea79 100644
--- a/distrib/i386/cdroms/Makefile.cdrom
+++ b/distrib/i386/cdroms/Makefile.cdrom
@@ -10,7 +10,7 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot,allow-multidot
CDINSTKERNEL= ../../instkernel
CDKERNELS= netbsd-GENERIC.gz netbsd
CDRELEASE_NOISOS= true
-CD_SETS= base etc
+CD_SETS= base etc gpufw
.if ${MKKMOD} != "no"
CD_SETS+= modules
.endif
diff --git a/distrib/notes/amd64/contents b/distrib/notes/amd64/contents
index 5e63d12616de..e02d82780bc3 100644
--- a/distrib/notes/amd64/contents
+++ b/distrib/notes/amd64/contents
@@ -155,6 +155,9 @@ be used if you are upgrading.
.It Sy games
This set includes the games and their manual pages.
.
+.It Sy gpufw
+This set includes firmware for graphical drivers.
+.
.\" Kernel set(s)
.
.It Sy kern-GENERIC
diff --git a/distrib/notes/evbarm/contents b/distrib/notes/evbarm/contents
index b1fe15922825..a38df0b86d5a 100644
--- a/distrib/notes/evbarm/contents
+++ b/distrib/notes/evbarm/contents
@@ -170,6 +170,9 @@ be used if you are upgrading.
.It Sy games
This set includes the games and their manual pages.
.
+.It Sy gpufw
+This set includes firmware for graphical drivers.
+.
.\" Kernel set(s)
.
.It Sy kern-GENERIC
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index 210fef8453c9..c0dfeb0ca353 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -186,6 +186,9 @@ be used if you are upgrading.
.It Sy games
This set includes the games and their manual pages.
.
+.It Sy gpufw
+This set includes firmware for graphical drivers.
+.
.\" MD kernel set(s) -------------------------------------------------
.
.It Sy kern-GENERIC
diff --git a/distrib/sets/README b/distrib/sets/README
index 499dc5deb97c..33c14bd9d8e6 100644
--- a/distrib/sets/README
+++ b/distrib/sets/README
@@ -54,6 +54,8 @@ the sets are as follows:
games: the games and their man pages.
+ gpufw: heavy firmware files used by graphical drivers.
+
man: all of the man pages for the system, except those
listed elsewhere (e.g. in comp, games, misc, text).
Includes machine-dependent man pages for this CPU.
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 94390f0ad095..167969606ea6 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -265,14 +265,6 @@
./libdata/firmware/if_wpi/README.iwlwifi-3945-ucode base-firmware-root firmware
./libdata/firmware/if_wpi/ipw3945.ucode base-obsolete obsolete,firmware
./libdata/firmware/if_wpi/iwlwifi-3945.ucode base-firmware-root firmware
-./libdata/firmware/nouveau base-firmware-usr
-./libdata/firmware/nouveau/nvidia base-firmware-usr
-./libdata/firmware/nouveau/nvidia/LICENCE.nvidia base-firmware-usr nouveaufirmware
-./libdata/firmware/nouveau/nvidia/gm206 base-firmware-usr
-./libdata/firmware/nouveau/nvidia/gm206/fecs_data.bin base-firmware-usr nouveaufirmware
-./libdata/firmware/nouveau/nvidia/gm206/fecs_inst.bin base-firmware-usr nouveaufirmware
-./libdata/firmware/nouveau/nvidia/gm206/gpccs_data.bin base-firmware-usr nouveaufirmware
-./libdata/firmware/nouveau/nvidia/gm206/gpccs_inst.bin base-firmware-usr nouveaufirmware
./libdata/firmware/nvidia base-firmware-root
./libdata/firmware/nvidia/tegra124 base-firmware-root
./libdata/firmware/nvidia/tegra124/LICENCE.nvidia base-firmware-root tegrafirmware
@@ -290,165 +282,6 @@
./libdata/firmware/qat/qat_c62x_mmp.bin base-firmware-root firmware
./libdata/firmware/qat/qat_d15xx.bin base-firmware-root firmware
./libdata/firmware/qat/qat_d15xx_mmp.bin base-firmware-root firmware
-./libdata/firmware/radeon base-firmware-usr
-./libdata/firmware/radeon/ARUBA_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/ARUBA_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/ARUBA_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/BARTS_mc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/BARTS_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/BARTS_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/BARTS_smc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/BONAIRE_ce.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/BONAIRE_mc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/BONAIRE_mc2.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/BONAIRE_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/BONAIRE_mec.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/BONAIRE_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/BONAIRE_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/BONAIRE_sdma.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/BONAIRE_smc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/BONAIRE_uvd.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/BONAIRE_vce.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/BTC_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/CAICOS_mc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/CAICOS_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/CAICOS_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/CAICOS_smc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/CAYMAN_mc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/CAYMAN_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/CAYMAN_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/CAYMAN_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/CAYMAN_smc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/CEDAR_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/CEDAR_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/CEDAR_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/CEDAR_smc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/CYPRESS_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/CYPRESS_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/CYPRESS_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/CYPRESS_smc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/CYPRESS_uvd.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/HAINAN_ce.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/HAINAN_mc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/HAINAN_mc2.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/HAINAN_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/HAINAN_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/HAINAN_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/HAINAN_smc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/HAWAII_ce.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/HAWAII_mc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/HAWAII_mc2.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/HAWAII_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/HAWAII_mec.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/HAWAII_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/HAWAII_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/HAWAII_sdma.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/HAWAII_smc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/JUNIPER_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/JUNIPER_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/JUNIPER_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/JUNIPER_smc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/KABINI_ce.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/KABINI_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/KABINI_mec.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/KABINI_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/KABINI_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/KABINI_sdma.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/KAVERI_ce.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/KAVERI_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/KAVERI_mec.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/KAVERI_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/KAVERI_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/KAVERI_sdma.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/MULLINS_ce.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/MULLINS_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/MULLINS_mec.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/MULLINS_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/MULLINS_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/MULLINS_sdma.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/OLAND_ce.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/OLAND_mc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/OLAND_mc2.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/OLAND_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/OLAND_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/OLAND_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/OLAND_smc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/PALM_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/PALM_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/PITCAIRN_ce.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/PITCAIRN_mc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/PITCAIRN_mc2.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/PITCAIRN_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/PITCAIRN_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/PITCAIRN_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/PITCAIRN_smc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/R100_cp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/R200_cp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/R300_cp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/R420_cp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/R520_cp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/R600_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/R600_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/R600_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/R600_uvd.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/R700_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/REDWOOD_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/REDWOOD_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/REDWOOD_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/REDWOOD_smc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RS600_cp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RS690_cp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RS780_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RS780_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RS780_uvd.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV610_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV610_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV620_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV620_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV630_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV630_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV635_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV635_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV670_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV670_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV710_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV710_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV710_smc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV710_uvd.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV730_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV730_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV730_smc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV740_smc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV770_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV770_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV770_smc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/RV770_uvd.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/SUMO2_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/SUMO2_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/SUMO_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/SUMO_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/SUMO_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/SUMO_uvd.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/TAHITI_ce.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/TAHITI_mc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/TAHITI_mc2.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/TAHITI_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/TAHITI_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/TAHITI_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/TAHITI_smc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/TAHITI_uvd.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/TAHITI_vce.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/TURKS_mc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/TURKS_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/TURKS_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/TURKS_smc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/VERDE_ce.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/VERDE_mc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/VERDE_mc2.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/VERDE_me.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/VERDE_pfp.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/VERDE_rlc.bin base-firmware-usr radeonfirmware
-./libdata/firmware/radeon/VERDE_smc.bin base-firmware-usr radeonfirmware
./libdata/firmware/ral base-firmware-root
./libdata/firmware/ral/ral-license base-firmware-root firmware
./libdata/firmware/ral/ral-rt2561 base-firmware-root firmware
diff --git a/distrib/sets/lists/gpufw/mi b/distrib/sets/lists/gpufw/mi
new file mode 100644
index 000000000000..6d14ba5dae86
--- /dev/null
+++ b/distrib/sets/lists/gpufw/mi
@@ -0,0 +1,328 @@
+# $NetBSD: mi,v 1.2 2020/04/04 15:39:16 jdolecek Exp $
+#
+# Note: don't delete entries from here - mark them as "obsolete" instead.
+#
+./etc/mtree/set.gpufw base-gpufw
+./libdata/firmware/nouveau base-gpufw
+./libdata/firmware/nouveau/nvidia base-gpufw
+./libdata/firmware/nouveau/nvidia/LICENCE.nvidia base-gpufw gpufirmware
+./libdata/firmware/nouveau/nvidia/gm206 base-gpufw
+./libdata/firmware/nouveau/nvidia/gm206/fecs_data.bin base-gpufw gpufirmware
+./libdata/firmware/nouveau/nvidia/gm206/fecs_inst.bin base-gpufw gpufirmware
+./libdata/firmware/nouveau/nvidia/gm206/gpccs_data.bin base-gpufw gpufirmware
+./libdata/firmware/nouveau/nvidia/gm206/gpccs_inst.bin base-gpufw gpufirmware
+./libdata/firmware/radeon base-gpufw
+./libdata/firmware/radeon/ARUBA_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/ARUBA_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/ARUBA_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/BARTS_mc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/BARTS_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/BARTS_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/BARTS_smc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/BONAIRE_ce.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/BONAIRE_mc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/BONAIRE_mc2.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/BONAIRE_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/BONAIRE_mec.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/BONAIRE_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/BONAIRE_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/BONAIRE_sdma.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/BONAIRE_smc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/BONAIRE_uvd.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/BONAIRE_vce.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/BTC_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/CAICOS_mc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/CAICOS_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/CAICOS_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/CAICOS_smc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/CAYMAN_mc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/CAYMAN_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/CAYMAN_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/CAYMAN_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/CAYMAN_smc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/CEDAR_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/CEDAR_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/CEDAR_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/CEDAR_smc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/CYPRESS_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/CYPRESS_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/CYPRESS_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/CYPRESS_smc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/CYPRESS_uvd.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/HAINAN_ce.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/HAINAN_mc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/HAINAN_mc2.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/HAINAN_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/HAINAN_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/HAINAN_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/HAINAN_smc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/HAWAII_ce.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/HAWAII_mc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/HAWAII_mc2.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/HAWAII_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/HAWAII_mec.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/HAWAII_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/HAWAII_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/HAWAII_sdma.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/HAWAII_smc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/JUNIPER_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/JUNIPER_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/JUNIPER_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/JUNIPER_smc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/KABINI_ce.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/KABINI_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/KABINI_mec.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/KABINI_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/KABINI_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/KABINI_sdma.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/KAVERI_ce.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/KAVERI_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/KAVERI_mec.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/KAVERI_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/KAVERI_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/KAVERI_sdma.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/MULLINS_ce.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/MULLINS_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/MULLINS_mec.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/MULLINS_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/MULLINS_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/MULLINS_sdma.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/OLAND_ce.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/OLAND_mc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/OLAND_mc2.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/OLAND_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/OLAND_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/OLAND_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/OLAND_smc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/PALM_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/PALM_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/PITCAIRN_ce.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/PITCAIRN_mc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/PITCAIRN_mc2.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/PITCAIRN_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/PITCAIRN_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/PITCAIRN_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/PITCAIRN_smc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/R100_cp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/R200_cp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/R300_cp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/R420_cp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/R520_cp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/R600_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/R600_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/R600_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/R600_uvd.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/R700_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/REDWOOD_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/REDWOOD_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/REDWOOD_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/REDWOOD_smc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RS600_cp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RS690_cp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RS780_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RS780_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RS780_uvd.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV610_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV610_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV620_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV620_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV630_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV630_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV635_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV635_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV670_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV670_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV710_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV710_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV710_smc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV710_uvd.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV730_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV730_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV730_smc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV740_smc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV770_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV770_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV770_smc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/RV770_uvd.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/SUMO2_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/SUMO2_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/SUMO_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/SUMO_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/SUMO_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/SUMO_uvd.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/TAHITI_ce.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/TAHITI_mc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/TAHITI_mc2.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/TAHITI_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/TAHITI_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/TAHITI_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/TAHITI_smc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/TAHITI_uvd.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/TAHITI_vce.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/TURKS_mc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/TURKS_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/TURKS_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/TURKS_smc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/VERDE_ce.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/VERDE_mc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/VERDE_mc2.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/VERDE_me.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/VERDE_pfp.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/VERDE_rlc.bin base-gpufw gpufirmware
+./libdata/firmware/radeon/VERDE_smc.bin base-gpufw gpufirmware
+./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
+./var/db/obsolete/gpufw base-gpufw
diff --git a/distrib/sets/maketars b/distrib/sets/maketars
index 6aabad55a6e7..bfee3d9430cb 100755
--- a/distrib/sets/maketars
+++ b/distrib/sets/maketars
@@ -7,7 +7,7 @@
# [-M metalog] [-N etcdir] [-F setlistsdir] [-d destdir]
# [-t tardir] [-U] [setname ...]
#
-# The default sets are "base comp debug dtb etc games man misc rescue tests text"
+# The default sets are "base comp debug dtb etc games gpufw man misc rescue tests text"
# The X sets are "xbase xcomp xdebug xetc xfont xserver"
# The extsrc sets are "extbase extcomp extetc"
#
diff --git a/distrib/sets/regpkgset b/distrib/sets/regpkgset
index b6cc685d94d8..dbf7b13a6908 100755
--- a/distrib/sets/regpkgset
+++ b/distrib/sets/regpkgset
@@ -123,7 +123,7 @@ if [ $# -lt 1 ]; then
fi
case "$1" in
-all) list="base comp dtb etc games man misc modules rescue tests text xbase xcomp xetc xfont xserver" ;;
+all) list="base comp dtb etc games gpufw man misc modules rescue tests text xbase xcomp xetc xfont xserver" ;;
*) list="$*" ;;
esac
diff --git a/distrib/sets/sets.subr b/distrib/sets/sets.subr
index 45812e3a2178..788d23c2556a 100644
--- a/distrib/sets/sets.subr
+++ b/distrib/sets/sets.subr
@@ -143,6 +143,11 @@ else
module=yes
modset="modules"
fi
+if [ "${MKGPUFIRMWARE}" = "no" ]; then
+ gpufwset=""
+else
+ gpufwset="gpufw"
+fi
if [ "${MKATF}" = "no" ]; then
testset=""
else
@@ -171,7 +176,7 @@ stlib=$shlib
if [ "${MKPIC}" = "no" ]; then
shlib=no
fi
-nlists="base comp $debugset $dtbset etc games man misc $modset rescue $testset text"
+nlists="base comp $debugset $dtbset etc games $gpufwset man misc $modset rescue $testset text"
xlists="xbase xcomp $xdebugset xetc xfont xserver"
extlists="extbase extcomp extetc"
diff --git a/distrib/utils/embedded/mkimage b/distrib/utils/embedded/mkimage
index af388757a5e9..c88e303663b3 100755
--- a/distrib/utils/embedded/mkimage
+++ b/distrib/utils/embedded/mkimage
@@ -62,7 +62,7 @@ MKUBOOTIMAGE=${TOOL_MKUBOOTIMAGE:-mkubootimage}
GZIP_CMD=${TOOL_GZIP:-gzip} # ${GZIP} is special to gzip(1)
src="/usr/src"
-sets="base comp etc games man misc modules rescue tests text"
+sets="base comp etc games gpufw man misc modules rescue tests text"
xsets="xbase xcomp xetc xfont xserver"
minfree="10%"
bar="==="
diff --git a/etc/Makefile b/etc/Makefile
index 94b219c6e636..3f1df8375df3 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -375,6 +375,9 @@ OBSOLETE.files+= debug
.if ${MKDTB} != "no"
OBSOLETE.files+= dtb
.endif
+.if ${MKGPUFIRMWARE} != "no"
+OBSOLETE.files+= gpufw
+.endif
.if ${MKKMOD} != "no"
OBSOLETE.files+= modules
.endif
diff --git a/external/nvidia-firmware/Makefile b/external/nvidia-firmware/Makefile
index 8f7b10e64681..c65f026b3b6d 100644
--- a/external/nvidia-firmware/Makefile
+++ b/external/nvidia-firmware/Makefile
@@ -2,7 +2,7 @@
.include <bsd.own.mk>
-.if ${MKNOUVEAUFIRMWARE} != "no"
+.if ${MKGPUFIRMWARE} != "no"
SUBDIR+= gm20x
.endif
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 2b4288628d47..cc9d115aea58 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -218,6 +218,10 @@ MKFIRMWARE If not "no", install the /libdata/firmware directory,
Default: yes on amd64, cobalt, evbarm evbmips, evbppc, hpcarm,
hppa, i386, mac68k, macppc, sandpoint, and sparc64, no elsewhere.
+MKGPUFIRMWARE If not "no", install the /libdata/firmware directory,
+ which is necessary for GPU drivers.
+ Default: yes on amd64, i386, evbarm. No elsewhere.
+
MKGCC If "no", don't build gcc(1) or any of the GCC-related
libraries (libgcc, libobjc, libstdc++).
Default: yes
@@ -369,10 +373,6 @@ MKNLS If "no", don't build or install the NLS files and locale
definition files.
Default: yes
-MKNOUVEAUFIRMWARE If "yes", install the /libdata/firmware/nouveau directory,
- which is necessary for the nouveau DRM driver.
- Default: yes on amd64 and i386, no elsewhere.
-
MKNPF If "no", don't build or install the NPF and its modules.
Default: yes
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 3dd43b263706..13faf86b7f9d 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1235,13 +1235,10 @@ MKFIRMWARE.macppc= yes
MKFIRMWARE.sandpoint= yes
MKFIRMWARE.sparc64= yes
-# Only install the nouveau and radeon firmwares on DRM-happy systems.
-MKNOUVEAUFIRMWARE.x86_64= yes
-MKNOUVEAUFIRMWARE.i386= yes
-MKNOUVEAUFIRMWARE.aarch64= yes
-MKRADEONFIRMWARE.x86_64= yes
-MKRADEONFIRMWARE.i386= yes
-MKRADEONFIRMWARE.aarch64= yes
+# Only install the GPU firmware on DRM-happy systems.
+MKGPUFIRMWARE.x86_64= yes
+MKGPUFIRMWARE.i386= yes
+MKGPUFIRMWARE.aarch64= yes
# Only install the tegra firmware on evbarm.
MKTEGRAFIRMWARE.evbarm= yes
@@ -1291,10 +1288,9 @@ _MKVARS.no= \
MKKYUA \
MKLIBCXX MKLLD MKLLDB MKLLVM MKLLVMRT MKLINT \
MKMANZ MKMCLINKER \
- MKNOUVEAUFIRMWARE MKNSD \
- MKOBJDIRS \
+ MKNSD MKOBJDIRS \
MKPCC MKPICINSTALL MKPIGZGZIP \
- MKRADEONFIRMWARE MKREPRO \
+ MKGPUFIRMWARE MKREPRO \
MKSLJIT MKSOFTFLOAT MKSTRIPIDENT \
MKTEGRAFIRMWARE MKTPM \
MKUNPRIVED MKUPDATE \
diff --git a/sys/dev/microcode/radeon/Makefile b/sys/dev/microcode/radeon/Makefile
index a98deff17c70..0f2bd426c063 100644
--- a/sys/dev/microcode/radeon/Makefile
+++ b/sys/dev/microcode/radeon/Makefile
@@ -4,7 +4,7 @@ NOMAN= # defined
.include <bsd.own.mk>
-.if ${MKRADEONFIRMWARE} != "no"
+.if ${MKGPUFIRMWARE} != "no"
FILES= \
R100_cp.bin \
diff --git a/usr.sbin/sysinst/Makefile.inc b/usr.sbin/sysinst/Makefile.inc
index b2b989f842fa..02299e36a27d 100644
--- a/usr.sbin/sysinst/Makefile.inc
+++ b/usr.sbin/sysinst/Makefile.inc
@@ -81,6 +81,10 @@ CPPFLAGS+= -DUSING_PAXASTAR
CPPFLAGS+= -DHAVE_DTB
.endif
+.if ${MKGPUFIRMWARE:Uno} != "no"
+CPPFLAGS+= -DHAVE_GPUFW
+.endif
+
.if ${MKKMOD:Uno} != "no"
CPPFLAGS+= -DHAVE_MODULES
.endif
diff --git a/usr.sbin/sysinst/arch/amd64/md.h b/usr.sbin/sysinst/arch/amd64/md.h
index 14c97a2c2a88..ef343d2e02ef 100644
--- a/usr.sbin/sysinst/arch/amd64/md.h
+++ b/usr.sbin/sysinst/arch/amd64/md.h
@@ -76,7 +76,7 @@
/*
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
- * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver
+ * base etc comp games gpufw man misc rescue tests text xbase xcomp xetc xfont xserver
*
* x86_64 has the MD set kern first, because generic kernels are too
* big to fit on install floppies.
diff --git a/usr.sbin/sysinst/arch/evbarm/md.h b/usr.sbin/sysinst/arch/evbarm/md.h
index b36c2cc59ce8..fb3aa9846573 100644
--- a/usr.sbin/sysinst/arch/evbarm/md.h
+++ b/usr.sbin/sysinst/arch/evbarm/md.h
@@ -60,7 +60,7 @@
/*
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
- * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver
+ * base etc comp games gpufw man misc rescue tests text xbase xcomp xetc xfont xserver
*/
#if 0 /* XXX */
#define SET_KERNEL_1_NAME "kern-ADI_BRH"
diff --git a/usr.sbin/sysinst/arch/i386/md.h b/usr.sbin/sysinst/arch/i386/md.h
index 2da868c75d2b..7834f66d8cd7 100644
--- a/usr.sbin/sysinst/arch/i386/md.h
+++ b/usr.sbin/sysinst/arch/i386/md.h
@@ -76,7 +76,7 @@
/*
* Default filesets to fetch and install during installation
* or upgrade. The standard sets are:
- * base etc comp games man misc rescue tests text xbase xcomp xetc xfont xserver
+ * base etc comp games gpufw man misc rescue tests text xbase xcomp xetc xfont xserver
*/
#define SET_KERNEL_GENERIC SET_KERNEL_1
diff --git a/usr.sbin/sysinst/defs.h b/usr.sbin/sysinst/defs.h
index e3a2db04bcf5..02bcec9347d6 100644
--- a/usr.sbin/sysinst/defs.h
+++ b/usr.sbin/sysinst/defs.h
@@ -141,6 +141,7 @@ enum {
SET_COMPILER, /* compiler tools */
SET_DTB, /* devicetree hardware descriptions */
SET_GAMES, /* text games */
+ SET_GPUFW, /* GPU firmware files */
SET_MAN_PAGES, /* online manual pages */
SET_MISC, /* miscellaneuous */
SET_MODULES, /* kernel modules */
@@ -191,10 +192,16 @@ enum {
#endif
/* Core system sets */
#ifdef HAVE_DTB
-#define SET_CORE WITH_MODULES SET_BASE, SET_DTB, SET_ETC
+#define WITH_DTB SET_DTB,
#else
-#define SET_CORE WITH_MODULES SET_BASE, SET_ETC
+#define WITH_DTB
#endif
+#ifdef HAVE_GPUFW
+#define WITH_GPUFW SET_GPUFW,
+#else
+#define WITH_GPUFW
+#endif
+#define SET_CORE WITH_MODULES SET_BASE, WITH_DTB WITH_GPUFW SET_ETC
/* All system sets */
#define SET_SYSTEM SET_CORE, SET_COMPILER, SET_GAMES, \
SET_MAN_PAGES, SET_MISC, SET_RESCUE, \
diff --git a/usr.sbin/sysinst/msg.mi.de b/usr.sbin/sysinst/msg.mi.de
index 98792197881c..e9d9810f8d65 100644
--- a/usr.sbin/sysinst/msg.mi.de
+++ b/usr.sbin/sysinst/msg.mi.de
@@ -884,6 +884,9 @@ message set_dtb
message set_games
{Spiele}
+message set_gpufw
+{Graphics driver firmware}
+
message set_man_pages
{Handbuchseiten (man pages)}
diff --git a/usr.sbin/sysinst/msg.mi.en b/usr.sbin/sysinst/msg.mi.en
index fe9f6bb43213..f293971f8d2b 100644
--- a/usr.sbin/sysinst/msg.mi.en
+++ b/usr.sbin/sysinst/msg.mi.en
@@ -818,6 +818,9 @@ message set_dtb
message set_games
{Games}
+message set_gpufw
+{Graphics driver firmware}
+
message set_man_pages
{Manual pages}
diff --git a/usr.sbin/sysinst/msg.mi.es b/usr.sbin/sysinst/msg.mi.es
index 0c76872efd2c..c198ae683563 100644
--- a/usr.sbin/sysinst/msg.mi.es
+++ b/usr.sbin/sysinst/msg.mi.es
@@ -843,6 +843,9 @@ message set_dtb
message set_games
{Juegos}
+message set_gpufw
+{Graphics driver firmware}
+
message set_man_pages
{Paginas de manual}
diff --git a/usr.sbin/sysinst/msg.mi.fr b/usr.sbin/sysinst/msg.mi.fr
index 52d69a115db1..f05b969394ef 100644
--- a/usr.sbin/sysinst/msg.mi.fr
+++ b/usr.sbin/sysinst/msg.mi.fr
@@ -878,6 +878,9 @@ message set_dtb
message set_games
{Jeux}
+message set_gpufw
+{Graphics driver firmware}
+
message set_man_pages
{Pages de manuel}
diff --git a/usr.sbin/sysinst/msg.mi.pl b/usr.sbin/sysinst/msg.mi.pl
index 1d0c9ac09117..d66e9a76aa20 100644
--- a/usr.sbin/sysinst/msg.mi.pl
+++ b/usr.sbin/sysinst/msg.mi.pl
@@ -815,6 +815,9 @@ message set_dtb
message set_games
{Gry}
+message set_gpufw
+{Graphics driver firmware}
+
message set_man_pages
{Strony Podrecznika}
diff --git a/usr.sbin/sysinst/util.c b/usr.sbin/sysinst/util.c
index 32219c37b414..53b445a2c65b 100644
--- a/usr.sbin/sysinst/util.c
+++ b/usr.sbin/sysinst/util.c
@@ -128,6 +128,9 @@ distinfo dist_list[] = {
{"etc", SET_ETC, false, MSG_set_system, NULL},
{"comp", SET_COMPILER, false, MSG_set_compiler, NULL},
{"games", SET_GAMES, false, MSG_set_games, NULL},
+#ifdef HAVE_GPUFW
+ {"gpufw", SET_GPUFW, false, MSG_set_gpufw, NULL},
+#endif
{"man", SET_MAN_PAGES, false, MSG_set_man_pages, NULL},
{"misc", SET_MISC, false, MSG_set_misc, NULL},
{"rescue", SET_RESCUE, false, MSG_set_rescue, NULL},
--
2.28.0
Home |
Main Index |
Thread Index |
Old Index