diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-20 02:31:31 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-20 02:33:40 +0200 |
commit | a2d8a9aad70d76e965ff33c8722604b068ca4bc8 (patch) | |
tree | 2de583ec0ac1ba7b61c064990285ff0b75bf21a8 /pkgs/misc/arm-trusted-firmware | |
parent | f71a636d3f52072bd2976dfc8bb4556214959af3 (diff) |
armTrustedFirmware: Remove targetPlatforms like was done in U-Boot
Should also fix Hydra attempting to build this stuff on x86, like
https://hydra.nixos.org/build/71533289
Diffstat (limited to 'pkgs/misc/arm-trusted-firmware')
-rw-r--r-- | pkgs/misc/arm-trusted-firmware/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 4b5a19579388..b4fa3662675a 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -1,8 +1,7 @@ { stdenv, fetchFromGitHub, buildPackages }: let - buildArmTrustedFirmware = { targetPlatforms - , filesToInstall + buildArmTrustedFirmware = { filesToInstall , installDir ? "$out" , platform , extraMakeFlags ? [] @@ -46,8 +45,6 @@ let description = "A reference implementation of secure world software for ARMv8-A"; license = licenses.bsd3; maintainers = [ maintainers.lopsided98 ]; - # TODO: Fix when #34444 is merged - # platforms = targetPlatforms; } // extraMeta; } // builtins.removeAttrs args [ "extraMeta" ]); @@ -64,13 +61,13 @@ in rec { sha256 = "0lbipkxb01w97r6ah8wdbwxir3013rp249fcqhlzh2gjwhp5l1ys"; }; platform = "sun50iw1p1"; - targetPlatforms = ["aarch64-linux"]; + extraMeta.platforms = ["aarch64-linux"]; filesToInstall = ["build/${platform}/release/bl31.bin"]; }; armTrustedFirmwareQemu = buildArmTrustedFirmware rec { platform = "qemu"; - targetPlatforms = ["aarch64-linux"]; + extraMeta.platforms = ["aarch64-linux"]; filesToInstall = [ "build/${platform}/release/bl1.bin" "build/${platform}/release/bl2.bin" @@ -81,7 +78,7 @@ in rec { armTrustedFirmwareRK3328 = buildArmTrustedFirmware rec { extraMakeFlags = [ "bl31" ]; platform = "rk3328"; - targetPlatforms = ["aarch64-linux"]; + extraMeta.platforms = ["aarch64-linux"]; filesToInstall = [ "build/${platform}/release/bl31/bl31.elf"]; }; } |