M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

include Sayma RTM bitstream in output

This commit is contained in:
Sebastien Bourdeauducq 2019-02-19 22:20:03 +08:00
parent a02af3e857
commit b47517897c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artiq/artiq-board.nix
View File

@ -2,7 +2,10 @@
# nix.sandboxPaths = ["/opt"]; # nix.sandboxPaths = ["/opt"];
{ pkgs ? import <nixpkgs> {}}: { pkgs ? import <nixpkgs> {}}:
{ target, variant, buildCommand ? "python -m artiq.gateware.targets.${target} -V ${variant}" }: { target
, variant
, buildCommand ? "python -m artiq.gateware.targets.${target} -V ${variant}"
, extraInstallCommands ? ""}:
let let
fetchcargo = import ./fetchcargo.nix { fetchcargo = import ./fetchcargo.nix {
@ -60,5 +63,6 @@ in pkgs.python3Packages.buildPythonPackage rec {
then cp artiq_${target}/${variant}/software/runtime/runtime.{elf,fbi} $TARGET_DIR then cp artiq_${target}/${variant}/software/runtime/runtime.{elf,fbi} $TARGET_DIR
else cp artiq_${target}/${variant}/software/satman/satman.{elf,fbi} $TARGET_DIR else cp artiq_${target}/${variant}/software/satman/satman.{elf,fbi} $TARGET_DIR
fi fi
${extraInstallCommands}
''; '';
} }

1
sinara-systems.nix
View File

@ -44,6 +44,7 @@ let
target = "sayma"; target = "sayma";
variant = "satellite"; variant = "satellite";
buildCommand = "python -m artiq.gateware.targets.sayma_rtm && python -m artiq.gateware.targets.sayma_amc -V satellite"; buildCommand = "python -m artiq.gateware.targets.sayma_rtm && python -m artiq.gateware.targets.sayma_amc -V satellite";
extraInstallCommands = "cp artiq_sayma/rtm_gateware/rtm.bit $TARGET_DIR";
}; };
} }
EOF EOF