From 98904ef4c38baec0651f7c8f49e2dfcf41835834 Mon Sep 17 00:00:00 2001 From: occheung Date: Sun, 3 Sep 2023 20:29:42 -0700 Subject: [PATCH] kasli: construct DRTIO-EEM modules before adding RTIO --- artiq/gateware/targets/kasli_generic.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/artiq/gateware/targets/kasli_generic.py b/artiq/gateware/targets/kasli_generic.py index da92af8ef..3a855933c 100755 --- a/artiq/gateware/targets/kasli_generic.py +++ b/artiq/gateware/targets/kasli_generic.py @@ -99,10 +99,12 @@ class GenericMaster(MasterBase): self.config["RTIO_LOG_CHANNEL"] = len(self.rtio_channels) self.rtio_channels.append(rtio.LogChannel()) - self.add_rtio(self.rtio_channels, sed_lanes=description["sed_lanes"]) if has_drtio_over_eem: self.add_eem_drtio(self.eem_drtio_channels) self.add_drtio_cpuif_groups() + + self.add_rtio(self.rtio_channels, sed_lanes=description["sed_lanes"]) + if has_grabber: self.config["HAS_GRABBER"] = None self.add_csr_group("grabber", self.grabber_csr_group)