From 58f30f5d875f140e3e3b8589a9738b9a459f3e77 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sat, 5 Mar 2022 18:39:13 +0800
Subject: [PATCH] artiq-zynq: fix SZL path

---
 artiq-zynq.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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 <nixpkgs> { overlays = [ (import ./artiq-fast/mozilla-overlay.nix) ]; };
   artiq-zynq = import <artiq-zynq>;
   artiq-fast = import <artiq-fast> { 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 ${<artiq-zynq>}
           bash ${<artiq-zynq>}/remote_run.sh -h rpi-4 -o "$NIX_SSHOPTS" -d ${artiq-zynq.zc706-nist_qc2-jtag}
           popd