public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

armTrustedFirmware: Remove targetPlatforms like was done in U-Boot

Browse Source 
Should also fix Hydra attempting to build this stuff on x86, like
https://hydra.nixos.org/build/71533289
This commit is contained in:
Tuomas Tynkkynen 2018-03-20 02:31:31 +02:00
parent f71a636d3f
commit a2d8a9aad7
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/misc/arm-trusted-firmware/default.nix
View File

@ -1,8 +1,7 @@
{ stdenv, fetchFromGitHub, buildPackages }: { stdenv, fetchFromGitHub, buildPackages }:
let let
buildArmTrustedFirmware = { targetPlatforms buildArmTrustedFirmware = { filesToInstall
, filesToInstall
, installDir ? "$out" , installDir ? "$out"
, platform , platform
, extraMakeFlags ? [] , extraMakeFlags ? []
@ -46,8 +45,6 @@ let
description = "A reference implementation of secure world software for ARMv8-A"; description = "A reference implementation of secure world software for ARMv8-A";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = [ maintainers.lopsided98 ]; maintainers = [ maintainers.lopsided98 ];
# TODO: Fix when #34444 is merged
# platforms = targetPlatforms;
} // extraMeta; } // extraMeta;
} // builtins.removeAttrs args [ "extraMeta" ]); } // builtins.removeAttrs args [ "extraMeta" ]);
@ -64,13 +61,13 @@ in rec {
sha256 = "0lbipkxb01w97r6ah8wdbwxir3013rp249fcqhlzh2gjwhp5l1ys"; sha256 = "0lbipkxb01w97r6ah8wdbwxir3013rp249fcqhlzh2gjwhp5l1ys";
}; };
platform = "sun50iw1p1"; platform = "sun50iw1p1";
targetPlatforms = ["aarch64-linux"]; extraMeta.platforms = ["aarch64-linux"];
filesToInstall = ["build/${platform}/release/bl31.bin"]; filesToInstall = ["build/${platform}/release/bl31.bin"];
}; };
armTrustedFirmwareQemu = buildArmTrustedFirmware rec { armTrustedFirmwareQemu = buildArmTrustedFirmware rec {
platform = "qemu"; platform = "qemu";
targetPlatforms = ["aarch64-linux"]; extraMeta.platforms = ["aarch64-linux"];
filesToInstall = [ filesToInstall = [
"build/${platform}/release/bl1.bin" "build/${platform}/release/bl1.bin"
"build/${platform}/release/bl2.bin" "build/${platform}/release/bl2.bin"
@ -81,7 +78,7 @@ in rec {
armTrustedFirmwareRK3328 = buildArmTrustedFirmware rec { armTrustedFirmwareRK3328 = buildArmTrustedFirmware rec {
extraMakeFlags = [ "bl31" ]; extraMakeFlags = [ "bl31" ];
platform = "rk3328"; platform = "rk3328";
targetPlatforms = ["aarch64-linux"]; extraMeta.platforms = ["aarch64-linux"];
filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"]; filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"];
}; };
} }