Module Name: src
Committed By: mrg
Date: Sun Apr 26 21:37:22 UTC 2015
Modified Files:
src/distrib/sets: mkvars.mk
src/distrib/sets/lists/base: mi
src/etc/mtree: NetBSD.dist.base
src/share/mk: bsd.README bsd.own.mk
src/sys/dev/microcode/radeon: Makefile
Log Message:
two changes to radeon drm firmware:
- only install it by default on x86, set new MKRADEONFIRMWARE variable
- install in /libdata, so that separate /usr systems work
(this still doesn't solve PR#49811, which possibly could be handled by
having them being a kernel module loaded by /boot.)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.1101 -r1.1102 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.143 -r1.144 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.340 -r1.341 src/share/mk/bsd.README
cvs rdiff -u -r1.846 -r1.847 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/microcode/radeon/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/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.16 src/distrib/sets/mkvars.mk:1.17
--- src/distrib/sets/mkvars.mk:1.16 Sun Mar 1 07:46:04 2015
+++ src/distrib/sets/mkvars.mk Sun Apr 26 21:37:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.16 2015/03/01 07:46:04 mrg Exp $
+# $NetBSD: mkvars.mk,v 1.17 2015/04/26 21:37:22 mrg Exp $
MKEXTRAVARS= \
MACHINE \
@@ -22,6 +22,7 @@ MKEXTRAVARS= \
MKXORG \
MKXORG_SERVER \
MKX11RADEONKMS \
+ MKRADEONFIRMWARE \
X11FLAVOR \
USE_INET6 \
USE_KERBEROS \
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1101 src/distrib/sets/lists/base/mi:1.1102
--- src/distrib/sets/lists/base/mi:1.1101 Tue Apr 21 22:41:32 2015
+++ src/distrib/sets/lists/base/mi Sun Apr 26 21:37:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1101 2015/04/21 22:41:32 christos Exp $
+# $NetBSD: mi,v 1.1102 2015/04/26 21:37:22 mrg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -213,6 +213,161 @@
./libdata/firmware/if_wpi/README.iwlwifi-3945-ucode base-firmware-root
./libdata/firmware/if_wpi/ipw3945.ucode base-obsolete obsolete
./libdata/firmware/if_wpi/iwlwifi-3945.ucode base-firmware-root
+./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/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/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/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/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
./libdata/firmware/ral/ral-rt2561 base-firmware-root
@@ -1090,161 +1245,161 @@
./usr/libdata/debug/usr/mdec base-sys-usr
./usr/libdata/debug/usr/sbin base-sys-usr
./usr/libdata/firmware base-firmware-usr
-./usr/libdata/firmware/radeon base-firmware-usr
-./usr/libdata/firmware/radeon/ARUBA_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/ARUBA_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/ARUBA_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/BARTS_mc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/BARTS_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/BARTS_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/BARTS_smc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/BONAIRE_ce.bin base-firmware-usr
-./usr/libdata/firmware/radeon/BONAIRE_mc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/BONAIRE_mc2.bin base-firmware-usr
-./usr/libdata/firmware/radeon/BONAIRE_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/BONAIRE_mec.bin base-firmware-usr
-./usr/libdata/firmware/radeon/BONAIRE_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/BONAIRE_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/BONAIRE_sdma.bin base-firmware-usr
-./usr/libdata/firmware/radeon/BONAIRE_smc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/BONAIRE_uvd.bin base-firmware-usr
-./usr/libdata/firmware/radeon/BONAIRE_vce.bin base-firmware-usr
-./usr/libdata/firmware/radeon/BTC_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/CAICOS_mc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/CAICOS_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/CAICOS_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/CAICOS_smc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/CAYMAN_mc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/CAYMAN_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/CAYMAN_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/CAYMAN_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/CAYMAN_smc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/CEDAR_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/CEDAR_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/CEDAR_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/CEDAR_smc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/CYPRESS_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/CYPRESS_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/CYPRESS_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/CYPRESS_smc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/CYPRESS_uvd.bin base-firmware-usr
-./usr/libdata/firmware/radeon/HAINAN_ce.bin base-firmware-usr
-./usr/libdata/firmware/radeon/HAINAN_mc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/HAINAN_mc2.bin base-firmware-usr
-./usr/libdata/firmware/radeon/HAINAN_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/HAINAN_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/HAINAN_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/HAINAN_smc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/HAWAII_ce.bin base-firmware-usr
-./usr/libdata/firmware/radeon/HAWAII_mc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/HAWAII_mc2.bin base-firmware-usr
-./usr/libdata/firmware/radeon/HAWAII_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/HAWAII_mec.bin base-firmware-usr
-./usr/libdata/firmware/radeon/HAWAII_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/HAWAII_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/HAWAII_sdma.bin base-firmware-usr
-./usr/libdata/firmware/radeon/HAWAII_smc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/JUNIPER_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/JUNIPER_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/JUNIPER_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/JUNIPER_smc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/KABINI_ce.bin base-firmware-usr
-./usr/libdata/firmware/radeon/KABINI_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/KABINI_mec.bin base-firmware-usr
-./usr/libdata/firmware/radeon/KABINI_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/KABINI_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/KABINI_sdma.bin base-firmware-usr
-./usr/libdata/firmware/radeon/KAVERI_ce.bin base-firmware-usr
-./usr/libdata/firmware/radeon/KAVERI_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/KAVERI_mec.bin base-firmware-usr
-./usr/libdata/firmware/radeon/KAVERI_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/KAVERI_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/KAVERI_sdma.bin base-firmware-usr
-./usr/libdata/firmware/radeon/MULLINS_ce.bin base-firmware-usr
-./usr/libdata/firmware/radeon/MULLINS_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/MULLINS_mec.bin base-firmware-usr
-./usr/libdata/firmware/radeon/MULLINS_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/MULLINS_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/MULLINS_sdma.bin base-firmware-usr
-./usr/libdata/firmware/radeon/OLAND_ce.bin base-firmware-usr
-./usr/libdata/firmware/radeon/OLAND_mc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/OLAND_mc2.bin base-firmware-usr
-./usr/libdata/firmware/radeon/OLAND_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/OLAND_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/OLAND_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/OLAND_smc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/PALM_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/PALM_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/PITCAIRN_ce.bin base-firmware-usr
-./usr/libdata/firmware/radeon/PITCAIRN_mc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/PITCAIRN_mc2.bin base-firmware-usr
-./usr/libdata/firmware/radeon/PITCAIRN_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/PITCAIRN_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/PITCAIRN_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/PITCAIRN_smc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/R100_cp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/R200_cp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/R300_cp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/R420_cp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/R520_cp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/R600_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/R600_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/R600_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/R700_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/REDWOOD_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/REDWOOD_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/REDWOOD_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/REDWOOD_smc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RS600_cp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RS690_cp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RS780_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RS780_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV610_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV610_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV620_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV620_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV630_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV630_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV635_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV635_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV670_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV670_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV710_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV710_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV710_smc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV710_uvd.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV730_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV730_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV730_smc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV740_smc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV770_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV770_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/RV770_smc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/SUMO2_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/SUMO2_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/SUMO_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/SUMO_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/SUMO_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/SUMO_uvd.bin base-firmware-usr
-./usr/libdata/firmware/radeon/TAHITI_ce.bin base-firmware-usr
-./usr/libdata/firmware/radeon/TAHITI_mc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/TAHITI_mc2.bin base-firmware-usr
-./usr/libdata/firmware/radeon/TAHITI_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/TAHITI_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/TAHITI_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/TAHITI_smc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/TAHITI_uvd.bin base-firmware-usr
-./usr/libdata/firmware/radeon/TURKS_mc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/TURKS_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/TURKS_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/TURKS_smc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/VERDE_ce.bin base-firmware-usr
-./usr/libdata/firmware/radeon/VERDE_mc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/VERDE_mc2.bin base-firmware-usr
-./usr/libdata/firmware/radeon/VERDE_me.bin base-firmware-usr
-./usr/libdata/firmware/radeon/VERDE_pfp.bin base-firmware-usr
-./usr/libdata/firmware/radeon/VERDE_rlc.bin base-firmware-usr
-./usr/libdata/firmware/radeon/VERDE_smc.bin base-firmware-usr
+./usr/libdata/firmware/radeon base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/ARUBA_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/ARUBA_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/ARUBA_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/BARTS_mc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/BARTS_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/BARTS_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/BARTS_smc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/BONAIRE_ce.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/BONAIRE_mc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/BONAIRE_mc2.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/BONAIRE_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/BONAIRE_mec.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/BONAIRE_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/BONAIRE_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/BONAIRE_sdma.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/BONAIRE_smc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/BONAIRE_uvd.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/BONAIRE_vce.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/BTC_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/CAICOS_mc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/CAICOS_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/CAICOS_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/CAICOS_smc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/CAYMAN_mc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/CAYMAN_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/CAYMAN_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/CAYMAN_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/CAYMAN_smc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/CEDAR_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/CEDAR_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/CEDAR_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/CEDAR_smc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/CYPRESS_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/CYPRESS_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/CYPRESS_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/CYPRESS_smc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/CYPRESS_uvd.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/HAINAN_ce.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/HAINAN_mc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/HAINAN_mc2.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/HAINAN_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/HAINAN_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/HAINAN_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/HAINAN_smc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/HAWAII_ce.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/HAWAII_mc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/HAWAII_mc2.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/HAWAII_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/HAWAII_mec.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/HAWAII_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/HAWAII_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/HAWAII_sdma.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/HAWAII_smc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/JUNIPER_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/JUNIPER_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/JUNIPER_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/JUNIPER_smc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/KABINI_ce.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/KABINI_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/KABINI_mec.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/KABINI_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/KABINI_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/KABINI_sdma.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/KAVERI_ce.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/KAVERI_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/KAVERI_mec.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/KAVERI_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/KAVERI_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/KAVERI_sdma.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/MULLINS_ce.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/MULLINS_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/MULLINS_mec.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/MULLINS_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/MULLINS_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/MULLINS_sdma.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/OLAND_ce.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/OLAND_mc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/OLAND_mc2.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/OLAND_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/OLAND_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/OLAND_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/OLAND_smc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/PALM_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/PALM_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/PITCAIRN_ce.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/PITCAIRN_mc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/PITCAIRN_mc2.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/PITCAIRN_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/PITCAIRN_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/PITCAIRN_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/PITCAIRN_smc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/R100_cp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/R200_cp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/R300_cp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/R420_cp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/R520_cp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/R600_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/R600_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/R600_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/R700_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/REDWOOD_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/REDWOOD_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/REDWOOD_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/REDWOOD_smc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RS600_cp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RS690_cp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RS780_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RS780_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV610_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV610_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV620_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV620_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV630_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV630_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV635_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV635_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV670_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV670_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV710_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV710_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV710_smc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV710_uvd.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV730_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV730_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV730_smc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV740_smc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV770_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV770_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/RV770_smc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/SUMO2_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/SUMO2_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/SUMO_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/SUMO_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/SUMO_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/SUMO_uvd.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/TAHITI_ce.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/TAHITI_mc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/TAHITI_mc2.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/TAHITI_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/TAHITI_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/TAHITI_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/TAHITI_smc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/TAHITI_uvd.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/TURKS_mc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/TURKS_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/TURKS_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/TURKS_smc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/VERDE_ce.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/VERDE_mc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/VERDE_mc2.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/VERDE_me.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/VERDE_pfp.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/VERDE_rlc.bin base-firmware-usr obsolete
+./usr/libdata/firmware/radeon/VERDE_smc.bin base-firmware-usr obsolete
./usr/libdata/ldscripts base-c-usr
./usr/libdata/lint base-c-usr
./usr/libexec base-sys-usr
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.143 src/etc/mtree/NetBSD.dist.base:1.144
--- src/etc/mtree/NetBSD.dist.base:1.143 Fri Feb 13 18:57:47 2015
+++ src/etc/mtree/NetBSD.dist.base Sun Apr 26 21:37:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.143 2015/02/13 18:57:47 nonaka Exp $
+# $NetBSD: NetBSD.dist.base,v 1.144 2015/04/26 21:37:22 mrg Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -73,6 +73,7 @@
./libdata/firmware/if_otus
./libdata/firmware/if_urtwn
./libdata/firmware/if_wpi
+./libdata/firmware/radeon
./libdata/firmware/ral
./libdata/firmware/rum
./libdata/firmware/run
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.340 src/share/mk/bsd.README:1.341
--- src/share/mk/bsd.README:1.340 Wed Apr 22 19:43:45 2015
+++ src/share/mk/bsd.README Sun Apr 26 21:37:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.340 2015/04/22 19:43:45 pooka Exp $
+# $NetBSD: bsd.README,v 1.341 2015/04/26 21:37:22 mrg Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -417,6 +417,10 @@ MKX11RADEONKMS If "no", build the xf86-v
kernek-mode switching (KMS) requiring driver.
Default: yes on i386 and amd64, no elsewhere.
+MKRADEONFIRMWARE If "no", install the /libdata/firmware/radeon directory,
+ which is necessary for the radeon DRM driver.
+ Default: yes on i386 and amd64, no elsewhere.
+
MKYP If "no", disables building of YP (NIS)
infrastructure (libraries and support programs).
Default: yes
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.846 src/share/mk/bsd.own.mk:1.847
--- src/share/mk/bsd.own.mk:1.846 Wed Apr 22 19:43:45 2015
+++ src/share/mk/bsd.own.mk Sun Apr 26 21:37:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.846 2015/04/22 19:43:45 pooka Exp $
+# $NetBSD: bsd.own.mk,v 1.847 2015/04/26 21:37:22 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1313,6 +1313,12 @@ MKX11RADEONKMS?= yes
.endif
MKX11RADEONKMS?= no
+# Only install the radeon firmware on DRM-happy systems.
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
+MKRADEONFIRMWARE?= yes
+.endif
+MKRADEONFIRMWARE?= no
+
.if ${X11FLAVOUR} == "Xorg"
X11DRI?= yes
.endif
Index: src/sys/dev/microcode/radeon/Makefile
diff -u src/sys/dev/microcode/radeon/Makefile:1.2 src/sys/dev/microcode/radeon/Makefile:1.3
--- src/sys/dev/microcode/radeon/Makefile:1.2 Mon Jul 28 23:09:06 2014
+++ src/sys/dev/microcode/radeon/Makefile Sun Apr 26 21:37:22 2015
@@ -1,7 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2014/07/28 23:09:06 rjs Exp $
+# $NetBSD: Makefile,v 1.3 2015/04/26 21:37:22 mrg Exp $
NOMAN= # defined
+.include <bsd.own.mk>
+
+.if ${MKRADEONFIRMWARE} != "no"
+
FILES= \
R100_cp.bin \
R200_cp.bin \
@@ -60,8 +64,10 @@ FILES= \
VERDE_ce.bin VERDE_mc.bin VERDE_mc2.bin VERDE_me.bin VERDE_pfp.bin \
VERDE_rlc.bin VERDE_smc.bin
-# DRM isn't necessary before /usr!
-FIRMWAREDIR= /usr/libdata/firmware
+# radeondrmks needs these after mountroot, but before starting init.
+FIRMWAREDIR= /libdata/firmware
+
+.endif
# XXX
includes:
