From d59aeb64d96193ccf5a7a83eb01d90b51ce07b79 Mon Sep 17 00:00:00 2001 From: snj Date: Thu, 7 May 2015 03:48:27 +0000 Subject: [PATCH] Pull up following revision(s) (requested by mrg in ticket #736): distrib/sets/mkvars.mk: revision 1.17 distrib/sets/lists/base/mi: revision 1.1102 etc/mtree/NetBSD.dist.base: revision 1.144 share/mk/bsd.README: revision 1.341 share/mk/bsd.own.mk: revision 1.847 sys/dev/microcode/radeon/Makefile: revision 1.3 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.) --- distrib/sets/lists/base/mi | 467 ++++++++++++++++++++---------- distrib/sets/mkvars.mk | 3 +- etc/mtree/NetBSD.dist.base | 3 +- share/mk/bsd.README | 6 +- share/mk/bsd.own.mk | 8 +- sys/dev/microcode/radeon/Makefile | 12 +- 6 files changed, 336 insertions(+), 163 deletions(-) diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index 26e878d99881..969a388c45d4 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1087.2.6 2015/04/30 06:07:31 riz Exp $ +# $NetBSD: mi,v 1.1087.2.7 2015/05/07 03:48:27 snj Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -203,6 +203,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 @@ -1078,161 +1233,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 diff --git a/distrib/sets/mkvars.mk b/distrib/sets/mkvars.mk index af3781534e5d..d578527fc861 100644 --- a/distrib/sets/mkvars.mk +++ b/distrib/sets/mkvars.mk @@ -1,4 +1,4 @@ -# $NetBSD: mkvars.mk,v 1.15.4.1 2015/03/09 08:45:26 snj Exp $ +# $NetBSD: mkvars.mk,v 1.15.4.2 2015/05/07 03:48:27 snj Exp $ MKEXTRAVARS= \ MACHINE \ @@ -22,6 +22,7 @@ MKEXTRAVARS= \ MKXORG \ MKXORG_SERVER \ MKX11RADEONKMS \ + MKRADEONFIRMWARE \ X11FLAVOR \ USE_INET6 \ USE_KERBEROS \ diff --git a/etc/mtree/NetBSD.dist.base b/etc/mtree/NetBSD.dist.base index 9f67f1b49e64..452db7c21b3f 100644 --- a/etc/mtree/NetBSD.dist.base +++ b/etc/mtree/NetBSD.dist.base @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.139.2.1 2015/04/30 06:07:32 riz Exp $ +# $NetBSD: NetBSD.dist.base,v 1.139.2.2 2015/05/07 03:48:27 snj Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -72,6 +72,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 diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 6aada090f8c9..38239e26ae7d 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.335.2.2 2015/03/18 08:12:16 snj Exp $ +# $NetBSD: bsd.README,v 1.335.2.3 2015/05/07 03:48:27 snj 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-video-ati 6.x driver (the last one 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 diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 295f95e37c22..b6de86b61630 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.829.2.6 2015/04/11 05:36:13 snj Exp $ +# $NetBSD: bsd.own.mk,v 1.829.2.7 2015/05/07 03:48:27 snj Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -1288,6 +1288,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 diff --git a/sys/dev/microcode/radeon/Makefile b/sys/dev/microcode/radeon/Makefile index 78cc7a250802..c52e37772a15 100644 --- a/sys/dev/microcode/radeon/Makefile +++ b/sys/dev/microcode/radeon/Makefile @@ -1,7 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2014/07/28 23:09:06 rjs Exp $ +# $NetBSD: Makefile,v 1.2.2.1 2015/05/07 03:48:27 snj Exp $ NOMAN= # defined +.include + +.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: