dnyarri: Add firmware RV710_smc and RV730_smc.

This now also makes specification of Radeon firmware way less redundant and
adding new firmware will be a change in *one* place.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

1 files changed, 13 insertions, 5 deletions

diff --git a/machines/dnyarri.nix b/machines/dnyarri.nix
index 179d14ea..445a5aac 100644
--- a/machines/dnyarri.nix
+++ b/machines/dnyarri.nix
@@ -34,10 +34,12 @@ with import ../lib;
       auto
     '';
 
-    builtinFW = [
-      "${pkgs.firmwareLinuxNonfree}/radeon/R600_rlc.bin"
-      "${pkgs.firmwareLinuxNonfree}/radeon/R700_rlc.bin"
-      "${pkgs.firmwareLinuxNonfree}/radeon/RV710_uvd.bin"
+    radeonFW = [
+      "radeon/R600_rlc.bin"
+      "radeon/R700_rlc.bin"
+      "radeon/RV710_uvd.bin"
+      "radeon/RV710_smc.bin"
+      "radeon/RV730_smc.bin"
     ];
 
     linuxAszlig = pkgs.linuxManualConfig {
@@ -47,11 +49,17 @@ with import ../lib;
         name = "aszlig-with-firmware.kconf";
         src = generateKConf (import ./dnyarri-kconf.nix);
 
+        extra_firmware = concatStringsSep " " (radeonFW ++ [
+          "patch51.fw"
+        ]);
+
         builtin_firmware = pkgs.stdenv.mkDerivation {
           name = "builtin-firmware";
           buildCommand = ''
             mkdir -p "$out/radeon"
-            ${concatMapStrings (x: "cp -Lv -t \"$out/radeon\" \"${x}\";") builtinFW}
+            ${concatMapStrings (x: ''
+              cp -Lv -t "$out/radeon" "${pkgs.firmwareLinuxNonfree}/${x}";
+            '') radeonFW}
 
             cp "${patch51}" "$out/${patch51Name}"
           '';