diff --git a/artiq-zynq.nix b/artiq-zynq.nix index c1be00d..ec2024c 100644 --- a/artiq-zynq.nix +++ b/artiq-zynq.nix @@ -2,11 +2,6 @@ let pkgs = import { overlays = [ (import ./artiq-fast/mozilla-overlay.nix) ]; }; artiq-zynq = import ; artiq-fast = import { inherit pkgs; }; - - zynq-rs = import artiq-zynq.zynq-rs; - # New zynq-rs versions with Kasli-SoC support have the multiboard "szl" package. - # Older versions need the SZL environment variable set to the SZL ELF to be loaded. - szlEnv = if zynq-rs ? "szl" then "${zynq-rs.szl}" else "${zynq-rs.zc706-szl}/szl.elf"; in ( builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) artiq-zynq @@ -60,7 +55,7 @@ in export USER=hydra export OPENOCD_ZYNQ=${artiq-zynq.zynq-rs}/openocd - export SZL=${szlEnv} + export SZL=${artiq-zynq.zynq-rs.zc706-szl}/szl.elf pushd ${} bash ${}/remote_run.sh -h rpi-4 -o "$NIX_SSHOPTS" -d ${artiq-zynq.zc706-nist_qc2-jtag} popd