From 0459a70cf694bd5bdda0ce05993b2d07d43ebd5b Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 21 Aug 2017 16:49:42 -0400 Subject: [PATCH] sayma_amc: cleanup, fix RTM UART forwarding --- artiq/gateware/targets/sayma_amc_standalone.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/artiq/gateware/targets/sayma_amc_standalone.py b/artiq/gateware/targets/sayma_amc_standalone.py index d272a9cd9..ec0cc175d 100755 --- a/artiq/gateware/targets/sayma_amc_standalone.py +++ b/artiq/gateware/targets/sayma_amc_standalone.py @@ -35,22 +35,23 @@ class SaymaAMCStandalone(MiniSoC, AMPSoC): **kwargs) AMPSoC.__init__(self) platform = self.platform - platform.toolchain.bitstream_commands.extend([ - "set_property BITSTREAM.GENERAL.COMPRESS True [current_design]", - ]) + platform.toolchain.bitstream_commands.append( + "set_property BITSTREAM.GENERAL.COMPRESS True [current_design]") self.submodules.leds = gpio.GPIOOut(Cat( platform.request("user_led", 0), platform.request("user_led", 1))) self.csr_devices.append("leds") + # forward RTM UART to second FTDI UART channel serial_1 = platform.request("serial", 1) serial_rtm = platform.request("serial_rtm") self.comb += [ serial_1.tx.eq(serial_rtm.rx), - serial_rtm.rx.eq(serial_1.tx) + serial_rtm.tx.eq(serial_1.rx) ] + # RTIO rtio_channels = [] for i in (2, 3): phy = ttl_simple.Output(platform.request("user_led", i)) @@ -91,6 +92,7 @@ class SaymaAMCStandalone(MiniSoC, AMPSoC): self.get_native_sdram_if()) self.csr_devices.append("rtio_analyzer") + def main(): parser = argparse.ArgumentParser( description="ARTIQ device binary builder / Sayma AMC stand-alone")