Firmware: Add drtio_eem.rs support

- Port from Artiq repo
- Initialize the drtio_eem on main, rtio_clocking
- Driver for eem_transceiver

.gitignore

@@ -3,3 +3,11 @@ examples/*.elf
 __pycache__
 
 build
+
+src/libboard_artiq/Cargo.toml
+src/libc/Cargo.toml
+src/libdyld/Cargo.toml
+src/libio/Cargo.toml
+src/libksupport/Cargo.toml
+src/runtime/Cargo.toml
+src/satman/Cargo.toml

README.md

@@ -58,7 +58,6 @@ Notes:
 - When calling make, you need to specify both the variant and firmware type.
 - Firmware type must be either ``runtime`` for DRTIO-less or DRTIO master variants, or ``satman`` for DRTIO satellite.
 - If the board is connected to the local machine, use the ``local_run.sh`` script.
-- To update ``zynq-rs``, update the cargo files as per usual for Rust projects, but also keep ``flake.lock`` in sync.
 
 License
 -------

flake.nix

@@ -122,9 +122,6 @@
         src = ./src;
         cargoLock = { 
           lockFile = src/Cargo.lock;
-          outputHashes = {
-            "libasync-0.0.0" = "sha256-MppR7yxs3cjG7tQc82vX0MhyN71CJL2QWkM65F5hrFU=";
-          };
         };
 
         nativeBuildInputs = [
@@ -138,6 +135,7 @@
           export XARGO_RUST_SRC="${rust}/lib/rustlib/src/rust/library"
           export CLANG_EXTRA_INCLUDE_DIR="${pkgs.llvmPackages_9.clang-unwrapped.lib}/lib/clang/9.0.1/include"
           export CARGO_HOME=$(mktemp -d cargo-home.XXX)
+          export ZYNQ_RS=${zynq-rs}
           make TARGET=${target} GWARGS="${if json == null then "-V ${variant}" else json}" ${fwtype}
         '';
 
@@ -251,18 +249,19 @@
         '';
     };
 
-    fmt-check = pkgs.stdenv.mkDerivation {
+    fmt-check = pkgs.stdenvNoCC.mkDerivation {
       name = "fmt-check";
 
-      nativeBuildInputs = [
+      src = ./src;
-        rust
-      ];
 
-      phases = [ "buildPhase" ];
+      nativeBuildInputs = [ rust pkgs.gnumake ];
+
+      phases = [ "unpackPhase" "buildPhase" ];
 
       buildPhase =
         ''
-        cd ${self}/src
+        export ZYNQ_RS=${zynq-rs}
+        make manifests
         cargo fmt -- --check
         touch $out
         '';
@@ -381,6 +380,7 @@
       ];
       XARGO_RUST_SRC = "${rust}/lib/rustlib/src/rust/library";
       CLANG_EXTRA_INCLUDE_DIR = "${pkgs.llvmPackages_9.clang-unwrapped.lib}/lib/clang/9.0.1/include";
+      ZYNQ_RS = "${zynq-rs}";
       OPENOCD_ZYNQ = "${zynq-rs}/openocd";
       SZL = "${zynqpkgs.szl}";
     };

src/Cargo.lock

@@ -242,13 +242,13 @@ dependencies = [
  "log_buffer",
  "nb 0.1.3",
  "unwind",
+ "vcell",
  "void",
 ]
 
 [[package]]
 name = "libasync"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#c15b54f92b3d4e125ae47a0dce7abe4b2bc9e054"
 dependencies = [
  "embedded-hal",
  "libcortex_a9",
@@ -281,7 +281,6 @@ dependencies = [
 [[package]]
 name = "libboard_zynq"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#c15b54f92b3d4e125ae47a0dce7abe4b2bc9e054"
 dependencies = [
  "bit_field",
  "embedded-hal",
@@ -306,7 +305,6 @@ dependencies = [
 [[package]]
 name = "libconfig"
 version = "0.1.0"
-source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#c15b54f92b3d4e125ae47a0dce7abe4b2bc9e054"
 dependencies = [
  "core_io",
  "fatfs",
@@ -317,7 +315,6 @@ dependencies = [
 [[package]]
 name = "libcortex_a9"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#c15b54f92b3d4e125ae47a0dce7abe4b2bc9e054"
 dependencies = [
  "bit_field",
  "libregister",
@@ -333,7 +330,6 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
 [[package]]
 name = "libregister"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#c15b54f92b3d4e125ae47a0dce7abe4b2bc9e054"
 dependencies = [
  "bit_field",
  "vcell",
@@ -343,7 +339,6 @@ dependencies = [
 [[package]]
 name = "libsupport_zynq"
 version = "0.0.0"
-source = "git+https://git.m-labs.hk/M-Labs/zynq-rs.git#c15b54f92b3d4e125ae47a0dce7abe4b2bc9e054"
 dependencies = [
  "cc",
  "compiler_builtins",

src/Makefile

@@ -7,13 +7,20 @@ runtime: ../build/runtime.bin
 
 satman: ../build/satman.bin
 
-.PHONY: all runtime_target satman_target
+.PHONY: all manifests
+
+manifests = libboard_artiq/Cargo.toml libc/Cargo.toml libdyld/Cargo.toml libio/Cargo.toml libksupport/Cargo.toml runtime/Cargo.toml satman/Cargo.toml
+
+$(manifests): %.toml: %.toml.tpl
+	sed s+@@ZYNQ_RS@@+$(ZYNQ_RS)+g $< > $@
+
+manifests: $(manifests)
 
 ../build/pl.rs ../build/rustc-cfg ../build/mem.rs: gateware/* 
 	mkdir -p ../build
 	python gateware/$(TARGET).py -r ../build/pl.rs -c ../build/rustc-cfg -m ../build/mem.rs $(GWARGS)
 
-../build/firmware/armv7-none-eabihf/release/runtime: ../build/pl.rs ../build/rustc-cfg ../build/mem.rs $(shell find . -type f -print)
+../build/firmware/armv7-none-eabihf/release/runtime: ../build/pl.rs ../build/rustc-cfg ../build/mem.rs $(manifests) $(shell find . -type f -not -name Cargo.toml -print)
 	cd runtime && \
 	XBUILD_SYSROOT_PATH=`pwd`/../../build/sysroot \
 	cargo xbuild --release \
@@ -23,7 +30,7 @@ satman: ../build/satman.bin
 ../build/runtime.bin: ../build/firmware/armv7-none-eabihf/release/runtime
 	llvm-objcopy -O binary ../build/firmware/armv7-none-eabihf/release/runtime ../build/runtime.bin
 
-../build/firmware/armv7-none-eabihf/release/satman: ../build/pl.rs ../build/rustc-cfg ../build/mem.rs $(shell find . -type f -print)
+../build/firmware/armv7-none-eabihf/release/satman: ../build/pl.rs ../build/rustc-cfg ../build/mem.rs $(manifests) $(shell find . -type f -not -name Cargo.toml -print)
 	cd satman && \
 	XBUILD_SYSROOT_PATH=`pwd`/../../build/sysroot \
 	cargo xbuild --release \
@@ -31,4 +38,4 @@ satman: ../build/satman.bin
 		--no-default-features --features=target_$(TARGET)
 
 ../build/satman.bin: ../build/firmware/armv7-none-eabihf/release/satman
-	llvm-objcopy -O binary ../build/firmware/armv7-none-eabihf/release/satman ../build/satman.bin
+	llvm-objcopy -O binary ../build/firmware/armv7-none-eabihf/release/satman ../build/satman.bin

src/gateware/kasli_soc.py

@@ -234,8 +234,7 @@ class GenericMaster(SoCCore):
             self.platform,
             self.ps7,
             txout_buf,
-            clk_sw=gtx0.tx_init.done,
+            clk_sw=gtx0.tx_init.done)
-            enable_sys5x=has_drtio_over_eem)
         self.csr_devices.append("sys_crg")
         self.crg = self.ps7 # HACK for eem_7series to find the clock
         self.crg.cd_sys = self.sys_crg.cd_sys

src/gateware/zynq_clocking.py

@@ -65,13 +65,12 @@ class ClockSwitchFSM(Module):
 
 
 class SYSCRG(Module, AutoCSR):
-    def __init__(self, platform, ps7, main_clk, clk_sw=None, freq=125e6, enable_sys5x=False):
+    def __init__(self, platform, ps7, main_clk, clk_sw=None, freq=125e6):
         # assumes bootstrap clock is same freq as main and sys output
         self.clock_domains.cd_sys = ClockDomain()
         self.clock_domains.cd_sys4x = ClockDomain(reset_less=True)
-        if enable_sys5x:
+        self.clock_domains.cd_sys5x = ClockDomain(reset_less=True)
-            self.clock_domains.cd_clk200 = ClockDomain()
+        self.clock_domains.cd_clk200 = ClockDomain()
-            self.clock_domains.cd_sys5x = ClockDomain(reset_less=True)
 
         self.current_clock = CSRStatus()
 
@@ -89,105 +88,55 @@ class SYSCRG(Module, AutoCSR):
         else:
             self.comb += self.clk_sw_fsm.i_clk_sw.eq(clk_sw)
 
-        if enable_sys5x:
+        mmcm_locked = Signal()
-            pll_clk200 = Signal()
+        mmcm_sys = Signal()
-            pll_fb_clk = Signal()
+        mmcm_sys4x = Signal()
-            pll_locked = Signal()
+        mmcm_sys5x = Signal()
-            self.specials += [
+        mmcm_clk208 = Signal()
-                Instance("PLLE2_BASE",
+        mmcm_fb_clk = Signal()
-                    p_CLKIN1_PERIOD=8.0,
+        self.specials += [
-                    i_CLKIN1=bootstrap_clk,
+            Instance("MMCME2_ADV",
+                p_STARTUP_WAIT="FALSE", o_LOCKED=mmcm_locked,
+                p_BANDWIDTH="HIGH",
+                p_REF_JITTER1=0.001,
+                p_CLKIN1_PERIOD=period, i_CLKIN1=main_clk,
+                p_CLKIN2_PERIOD=period, i_CLKIN2=bootstrap_clk,
+                i_CLKINSEL=self.clk_sw_fsm.o_clk_sw,
 
-                    i_CLKFBIN=pll_fb_clk,
+                # VCO @ 1.25GHz
-                    o_CLKFBOUT=pll_fb_clk,
+                p_CLKFBOUT_MULT_F=10, p_DIVCLK_DIVIDE=1,
-                    o_LOCKED=pll_locked,
+                i_CLKFBIN=mmcm_fb_clk,
+                i_RST=self.clk_sw_fsm.o_reset,
 
-                    # VCO @ 1GHz
+                o_CLKFBOUT=mmcm_fb_clk,
-                    p_CLKFBOUT_MULT=8, p_DIVCLK_DIVIDE=1,
 
-                    # 200MHz for IDELAYCTRL
+                p_CLKOUT0_DIVIDE_F=2.5, p_CLKOUT0_PHASE=0.0, o_CLKOUT0=mmcm_sys4x,
-                    p_CLKOUT0_DIVIDE=5, p_CLKOUT0_PHASE=0.0, o_CLKOUT0=pll_clk200,
-                ),
-                Instance("BUFG", i_I=pll_clk200, o_O=self.cd_clk200.clk),
-                AsyncResetSynchronizer(self.cd_clk200, ~pll_locked),
-            ]
 
-            reset_counter = Signal(4, reset=15)
+                # 125MHz
-            ic_reset = Signal(reset=1)
+                p_CLKOUT1_DIVIDE=10, p_CLKOUT1_PHASE=0.0, o_CLKOUT1=mmcm_sys,
-            self.sync.clk200 += \
-                If(reset_counter != 0,
-                    reset_counter.eq(reset_counter - 1)
-                ).Else(
-                    ic_reset.eq(0)
-                )
-            self.specials += Instance("IDELAYCTRL", i_REFCLK=ClockSignal("clk200"), i_RST=ic_reset)
 
-            mmcm_locked = Signal()
+                # 625MHz
-            mmcm_sys = Signal()
+                p_CLKOUT2_DIVIDE=2, p_CLKOUT2_PHASE=0.0, o_CLKOUT2=mmcm_sys5x,
-            mmcm_sys4x = Signal()
-            mmcm_sys5x = Signal()
-            mmcm_fb_clk = Signal()
-            self.specials += [
-                Instance("MMCME2_ADV",
-                    p_STARTUP_WAIT="FALSE", o_LOCKED=mmcm_locked,
-                    p_BANDWIDTH="HIGH",
-                    p_REF_JITTER1=0.001,
-                    p_CLKIN1_PERIOD=period, i_CLKIN1=main_clk,
-                    p_CLKIN2_PERIOD=period, i_CLKIN2=bootstrap_clk,
-                    i_CLKINSEL=self.clk_sw_fsm.o_clk_sw,
 
-                    # VCO @ 1.25GHz with MULT=10
+                # 208MHz
-                    p_CLKFBOUT_MULT_F=10, p_DIVCLK_DIVIDE=1,
+                p_CLKOUT3_DIVIDE=6, p_CLKOUT3_PHASE=0.0, o_CLKOUT3=mmcm_clk208,
-                    i_CLKFBIN=mmcm_fb_clk,
+            ),
-                    i_RST=self.clk_sw_fsm.o_reset,
+            Instance("BUFG", i_I=mmcm_sys5x, o_O=self.cd_sys5x.clk),
+            Instance("BUFG", i_I=mmcm_sys, o_O=self.cd_sys.clk),
+            Instance("BUFG", i_I=mmcm_sys4x, o_O=self.cd_sys4x.clk),
+            Instance("BUFG", i_I=mmcm_clk208, o_O=self.cd_clk200.clk),
+            AsyncResetSynchronizer(self.cd_sys, ~mmcm_locked),
+            AsyncResetSynchronizer(self.cd_clk200, ~mmcm_locked),
+        ]
 
-                    o_CLKFBOUT=mmcm_fb_clk,
+        reset_counter = Signal(4, reset=15)
-
+        ic_reset = Signal(reset=1)
-                    # 500MHz. Must be more than 400MHz as per DDR3 specs.
+        self.sync.clk200 += \
-                    p_CLKOUT0_DIVIDE_F=2.5, p_CLKOUT0_PHASE=0.0, o_CLKOUT0=mmcm_sys4x,
+            If(reset_counter != 0,
-
+                reset_counter.eq(reset_counter - 1)
-                    # 125MHz
+            ).Else(
-                    p_CLKOUT1_DIVIDE=10, p_CLKOUT1_PHASE=0.0, o_CLKOUT1=mmcm_sys,
+                ic_reset.eq(0)
-
+            )
-                    # 625MHz
+        self.specials += Instance("IDELAYCTRL", i_REFCLK=ClockSignal("clk200"), i_RST=ic_reset)
-                    p_CLKOUT2_DIVIDE=2, p_CLKOUT2_PHASE=0.0, o_CLKOUT2=mmcm_sys5x,
-                ),
-                Instance("BUFG", i_I=mmcm_sys5x, o_O=self.cd_sys5x.clk),
-                Instance("BUFG", i_I=mmcm_sys, o_O=self.cd_sys.clk),
-                Instance("BUFG", i_I=mmcm_sys4x, o_O=self.cd_sys4x.clk),
-                AsyncResetSynchronizer(self.cd_sys, ~mmcm_locked),
-            ]
-        else:
-            pll_locked = Signal()
-            pll_sys = Signal()
-            pll_sys4x = Signal()
-            fb_clk = Signal()
-            self.specials += [
-                Instance("PLLE2_ADV",
-                    p_STARTUP_WAIT="FALSE", o_LOCKED=pll_locked,
-                    p_BANDWIDTH="HIGH",
-                    p_REF_JITTER1=0.001,
-                    p_CLKIN1_PERIOD=period, i_CLKIN1=main_clk,
-                    p_CLKIN2_PERIOD=period, i_CLKIN2=bootstrap_clk,
-                    i_CLKINSEL=self.clk_sw_fsm.o_clk_sw,
-
-                    # VCO @ 1.5GHz when using 125MHz input
-                    # 1.2GHz for 100MHz (zc706)
-                    p_CLKFBOUT_MULT=12, p_DIVCLK_DIVIDE=1,
-                    i_CLKFBIN=fb_clk,
-                    i_RST=self.clk_sw_fsm.o_reset,
-
-                    o_CLKFBOUT=fb_clk,
-
-                    p_CLKOUT0_DIVIDE=3, p_CLKOUT0_PHASE=0.0,
-                    o_CLKOUT0=pll_sys4x,
-
-                    p_CLKOUT1_DIVIDE=12, p_CLKOUT1_PHASE=0.0,
-                    o_CLKOUT1=pll_sys),
-
-                Instance("BUFG", i_I=pll_sys, o_O=self.cd_sys.clk),
-                Instance("BUFG", i_I=pll_sys4x, o_O=self.cd_sys4x.clk),
-                AsyncResetSynchronizer(self.cd_sys, ~pll_locked),
-            ]
 
         self.comb += self.current_clock.status.eq(self.clk_sw_fsm.o_clk_sw)

src/libboard_artiq/Cargo.toml.tpl

@@ -24,9 +24,9 @@ nb = "1.0"
 void = { version = "1", default-features = false }
 
 io = { path = "../libio", features = ["byteorder"] }
-libboard_zynq = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git"}
+libboard_zynq = { path = "@@ZYNQ_RS@@/libboard_zynq" }
-libsupport_zynq = { default-features = false, features = ["alloc_core"], git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libsupport_zynq = { path = "@@ZYNQ_RS@@/libsupport_zynq", default-features = false, features = ["alloc_core"] }
-libregister = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libregister = { path = "@@ZYNQ_RS@@/libregister" }
-libconfig = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git", features = ["fat_lfn"] }
+libconfig = { path = "@@ZYNQ_RS@@/libconfig", features = ["fat_lfn"] }
-libcortex_a9 = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libcortex_a9 = { path = "@@ZYNQ_RS@@/libcortex_a9" }
-libasync = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libasync = { path = "@@ZYNQ_RS@@/libasync" }

src/libc/Cargo.toml.tpl

@@ -6,7 +6,7 @@ edition = "2018"
 build = "build.rs"
 
 [dependencies]
-libboard_zynq = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libboard_zynq = { path = "@@ZYNQ_RS@@/libboard_zynq" }
 
 [build-dependencies]
 cc = { version = "1.0.1" }

src/libdyld/Cargo.toml.tpl

@@ -8,4 +8,4 @@ name = "dyld"
 
 [dependencies]
 log = "0.4"
-libcortex_a9 = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libcortex_a9 = { path = "@@ZYNQ_RS@@/libcortex_a9" }

src/libio/Cargo.toml.tpl

@@ -11,7 +11,7 @@ path = "lib.rs"
 core_io = { version = "0.1", features = ["collections"] }
 byteorder = { version = "1.0", default-features = false, optional = true }
 
-libsupport_zynq = { default-features = false, features = ["alloc_core"], git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libsupport_zynq = { path = "@@ZYNQ_RS@@/libsupport_zynq", default-features = false, features = ["alloc_core"] }
 
 [features]
 alloc = []

src/libksupport/Cargo.toml.tpl

@@ -17,17 +17,18 @@ byteorder = { version = "1.3", default-features = false }
 void = { version = "1", default-features = false }
 log_buffer = { version = "1.2" }
 libm = { version = "0.2", features = ["unstable"] }
+vcell = "0.1"
 
-libboard_zynq = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git", features = ["ipv6"]}
+libboard_zynq = { path = "@@ZYNQ_RS@@/libboard_zynq", features = ["ipv6"]}
-libsupport_zynq = { default-features = false, features = ["alloc_core"], git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libsupport_zynq = { path = "@@ZYNQ_RS@@/libsupport_zynq", default-features = false, features = ["alloc_core"] }
-libcortex_a9 = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libcortex_a9 = { path = "@@ZYNQ_RS@@/libcortex_a9" }
-libasync = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libasync = { path = "@@ZYNQ_RS@@/libasync" }
-libregister = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libregister = { path = "@@ZYNQ_RS@@/libregister" }
-libconfig = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git", features = ["fat_lfn", "ipv6"] }
+libconfig = { path = "@@ZYNQ_RS@@/libconfig", features = ["fat_lfn", "ipv6"] }
 
 dyld = { path = "../libdyld" }
 dwarf = { path = "../libdwarf" }
 unwind = { path = "../libunwind" }
 libc = { path = "../libc" }
 io = { path = "../libio" }
-libboard_artiq = { path = "../libboard_artiq" }
+libboard_artiq = { path = "../libboard_artiq" }

src/runtime/Cargo.toml.tpl

@@ -27,12 +27,12 @@ async-recursion = "0.3"
 log_buffer = { version = "1.2" }
 vcell = "0.1"
 
-libboard_zynq = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git", features = ["ipv6"]}
+libboard_zynq = { path = "@@ZYNQ_RS@@/libboard_zynq", features = ["ipv6"]}
-libsupport_zynq = { default-features = false, features = ["alloc_core"], git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libsupport_zynq = { path = "@@ZYNQ_RS@@/libsupport_zynq", default-features = false, features = ["alloc_core"] }
-libcortex_a9 = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libcortex_a9 = { path = "@@ZYNQ_RS@@/libcortex_a9" }
-libasync = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libasync = { path = "@@ZYNQ_RS@@/libasync" }
-libregister = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libregister = { path = "@@ZYNQ_RS@@/libregister" }
-libconfig = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git", features = ["fat_lfn", "ipv6"] }
+libconfig = { path = "@@ZYNQ_RS@@/libconfig", features = ["fat_lfn", "ipv6"] }
 
 dyld = { path = "../libdyld" }
 dwarf = { path = "../libdwarf" }

src/satman/Cargo.toml.tpl

@@ -18,12 +18,12 @@ core_io = { version = "0.1", features = ["collections"] }
 cslice = "0.3"
 embedded-hal = "0.2"
 
-libboard_zynq = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git", features = ["ipv6"]}
+libboard_zynq = { path = "@@ZYNQ_RS@@/libboard_zynq", features = ["ipv6"]}
-libsupport_zynq = { default-features = false, features = ["alloc_core"], git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libsupport_zynq = { path = "@@ZYNQ_RS@@/libsupport_zynq", default-features = false, features = ["alloc_core"] }
-libcortex_a9 = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libcortex_a9 = { path = "@@ZYNQ_RS@@/libcortex_a9" }
-libasync = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libasync = { path = "@@ZYNQ_RS@@/libasync" }
-libregister = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git" }
+libregister = { path = "@@ZYNQ_RS@@/libregister" }
-libconfig = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git", features = ["fat_lfn", "ipv6"] }
+libconfig = { path = "@@ZYNQ_RS@@/libconfig", features = ["fat_lfn", "ipv6"] }
 
 libboard_artiq = { path = "../libboard_artiq" }
 unwind = { path = "../libunwind" }