From 6b811c1a8b978efa4347862169e6dc2fcc8bdae0 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 9 May 2018 19:47:29 +0800 Subject: [PATCH] sayma: fix runtime/rtm gateware address conflict --- artiq/frontend/artiq_flash.py | 2 +- artiq/gateware/targets/sayma_amc.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/artiq/frontend/artiq_flash.py b/artiq/frontend/artiq_flash.py index 0ed2a5fde..fb6610297 100755 --- a/artiq/frontend/artiq_flash.py +++ b/artiq/frontend/artiq_flash.py @@ -281,7 +281,7 @@ def main(): "bootloader": ("spi1", 0x000000), "storage": ("spi1", 0x040000), "firmware": ("spi1", 0x050000), - "rtm_gateware": ("spi1", 0x150000), + "rtm_gateware": ("spi1", 0x200000), }, }[args.target] diff --git a/artiq/gateware/targets/sayma_amc.py b/artiq/gateware/targets/sayma_amc.py index 6e2415d57..d0262a00b 100755 --- a/artiq/gateware/targets/sayma_amc.py +++ b/artiq/gateware/targets/sayma_amc.py @@ -170,7 +170,7 @@ class Standalone(MiniSoC, AMPSoC): ]) self.csr_devices.append("slave_fpga_cfg") # self.config["HAS_SLAVE_FPGA"] = None - self.config["SLAVE_FPGA_GATEWARE"] = 0x150000 + self.config["SLAVE_FPGA_GATEWARE"] = 0x200000 # AMC/RTM serwb serwb_pads = platform.request("amc_rtm_serwb")