linuswck/artiq-zynq
1
0
Fork 0
forked from M-Labs/artiq-zynq
Code Pull Requests Activity

flake: remove unnecessary output

Browse Source
This commit is contained in:
mwojcik 2022-05-26 12:13:55 +08:00 committed by Gitea
parent 01339c9e78
commit dce8c974eb
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
flake.nix
View File

@ -122,8 +122,7 @@
"nist_clock_satellite" "nist_qc2_satellite" "acpki_nist_clock_satellite" "acpki_nist_qc2_satellite" "nist_clock_satellite" "nist_qc2_satellite" "acpki_nist_clock_satellite" "acpki_nist_qc2_satellite"
"nist_clock_satellite_100mhz" "nist_qc2_satellite_100mhz" "acpki_nist_clock_satellite_100mhz" "acpki_nist_qc2_satellite_100mhz" "nist_clock_satellite_100mhz" "nist_qc2_satellite_100mhz" "acpki_nist_clock_satellite_100mhz" "acpki_nist_qc2_satellite_100mhz"
]; ];
build = { target, variant, json ? null, output ? null }: let build = { target, variant, json ? null }: let
# output - if null will build everything (fw, gw, jtag, sd) or can be specified to build only one
szl = zynqpkgs."${target}-szl"; szl = zynqpkgs."${target}-szl";
fsbl = zynqpkgs."${target}-fsbl"; fsbl = zynqpkgs."${target}-fsbl";
fwtype = if builtins.elem variant sat_variants then "satman" else "runtime"; fwtype = if builtins.elem variant sat_variants then "satman" else "runtime";
@ -236,26 +235,17 @@
mkbootimage boot.bif $out/boot.bin mkbootimage boot.bif $out/boot.bin
echo file binary-dist $out/boot.bin >> $out/nix-support/hydra-build-products echo file binary-dist $out/boot.bin >> $out/nix-support/hydra-build-products
''; '';
in ( in {
if output == null || output == "firmware" then { "${target}-${variant}-firmware" = firmware;
"${target}-${variant}-firmware" = firmware; "${target}-${variant}-gateware" = gateware;
} else {} "${target}-${variant}-jtag" = jtag;
) // ( "${target}-${variant}-sd" = sd;
if output == null || output == "gateware" then { } // (
"${target}-${variant}-gateware" = gateware; if builtins.elem target fsblTargets
} else {} then {
) // ( "${target}-${variant}-fsbl-sd" = fsbl-sd;
if output == null || output == "jtag" then { }
"${target}-${variant}-jtag" = jtag; else {}
} else {}
) // (
if output == null || output == "sd" then {
"${target}-${variant}-sd" = sd;
} else {}
) // (
if builtins.elem target fsblTargets && (output == null || output == "fsbl-sd") then {
"${target}-${variant}-fsbl-sd" = fsbl-sd;
} else {}
); );
gateware-sim = pkgs.stdenv.mkDerivation { gateware-sim = pkgs.stdenv.mkDerivation {