diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2013-08-15 13:32:07 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2013-08-15 13:52:43 +0200 |
| commit | 876ff7dae6dee333d510d3af46b587787f5df3dc (patch) | |
| tree | da4aae74c4dacea1692dc17c948aa5c656f286b7 | |
| parent | 90df58c79d2f8d64acd1e120df37106aedd4b347 (diff) | |
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>
| -rw-r--r-- | machines/dnyarri-kconf.nix | 2 | ||||
| -rw-r--r-- | machines/dnyarri.nix | 18 |
2 files changed, 14 insertions, 6 deletions
diff --git a/machines/dnyarri-kconf.nix b/machines/dnyarri-kconf.nix index 6572157b..96a722bf 100644 --- a/machines/dnyarri-kconf.nix +++ b/machines/dnyarri-kconf.nix @@ -636,7 +636,7 @@ "CONFIG_DEVTMPFS_MOUNT" = "y"; "CONFIG_FW_LOADER" = "y"; "CONFIG_FIRMWARE_IN_KERNEL" = "y"; - "CONFIG_EXTRA_FIRMWARE" = "radeon/R600_rlc.bin radeon/R700_rlc.bin patch51.fw"; + "CONFIG_EXTRA_FIRMWARE" = "@extra_firmware@"; "CONFIG_EXTRA_FIRMWARE_DIR" = "@builtin_firmware@"; "CONFIG_DMA_SHARED_BUFFER" = "y"; "CONFIG_CONNECTOR" = "y"; 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}" ''; |