M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

sayma: fix runtime/rtm gateware address conflict

This commit is contained in:
Sebastien Bourdeauducq 2018-05-09 19:47:29 +08:00
parent 9de08f85c6
commit 6b811c1a8b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/frontend/artiq_flash.py
View File

@ -281,7 +281,7 @@ def main():
"bootloader": ("spi1", 0x000000), "bootloader": ("spi1", 0x000000),
"storage": ("spi1", 0x040000), "storage": ("spi1", 0x040000),
"firmware": ("spi1", 0x050000), "firmware": ("spi1", 0x050000),
"rtm_gateware": ("spi1", 0x150000), "rtm_gateware": ("spi1", 0x200000),
}, },
}[args.target] }[args.target]

2
artiq/gateware/targets/sayma_amc.py
View File

@ -170,7 +170,7 @@ class Standalone(MiniSoC, AMPSoC):
]) ])
self.csr_devices.append("slave_fpga_cfg") self.csr_devices.append("slave_fpga_cfg")
# self.config["HAS_SLAVE_FPGA"] = None # self.config["HAS_SLAVE_FPGA"] = None
self.config["SLAVE_FPGA_GATEWARE"] = 0x150000 self.config["SLAVE_FPGA_GATEWARE"] = 0x200000
# AMC/RTM serwb # AMC/RTM serwb
serwb_pads = platform.request("amc_rtm_serwb") serwb_pads = platform.request("amc_rtm_serwb")