From 25170a53e54c9ef8b736075c48d163c1ebcf5d11 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 18 Jul 2018 10:27:54 +0800 Subject: [PATCH] sayma: add back Urukul and Zotino --- artiq/gateware/targets/sayma_amc.py | 8 ++++---- conda/artiq-dev/meta.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/artiq/gateware/targets/sayma_amc.py b/artiq/gateware/targets/sayma_amc.py index 91605cd50..b24bf88fa 100755 --- a/artiq/gateware/targets/sayma_amc.py +++ b/artiq/gateware/targets/sayma_amc.py @@ -474,12 +474,12 @@ class Master(MiniSoC, AMPSoC): phy = ttl_simple.Output(s) self.submodules += phy rtio_channels.append(rtio.Channel.from_phy(phy)) - #eem.Urukul.add_std(self, 1, 0, ttl_simple.Output, - # iostandard="LVDS") eem.DIO.add_std(self, 2, ttl_simple.Output, ttl_simple.Output, iostandard="LVDS") - #eem.Zotino.add_std(self, 3, ttl_simple.Output, - # iostandard="LVDS") + eem.Urukul.add_std(self, 1, 0, ttl_simple.Output, + iostandard="LVDS") + eem.Zotino.add_std(self, 3, ttl_simple.Output, + iostandard="LVDS") self.config["HAS_RTIO_LOG"] = None self.config["RTIO_LOG_CHANNEL"] = len(rtio_channels) diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml index 38885177d..2ea57effb 100644 --- a/conda/artiq-dev/meta.yaml +++ b/conda/artiq-dev/meta.yaml @@ -15,7 +15,7 @@ requirements: - python >=3.5.3,<3.6 - setuptools 33.1.1 - migen 0.7 py35_73+gitbef9dea - - misoc 0.11 py35_27+git37dfced7 + - misoc 0.11 py35_29+git57ebe119 - jesd204b 0.7 - microscope - binutils-or1k-linux >=2.27