M-Labs/artiq
2
0
Fork 2
mirror of https://github.com/m-labs/artiq.git synced 2024-12-26 03:38:25 +08:00
Code Issues Projects Releases Wiki Activity

kc705: fix drtio_aux address conflict

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2016-12-06 18:28:48 +08:00
parent 4669d3f02f
commit b311830fc4
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/gateware/targets/kc705_drtio_master.py
View File

@ -30,7 +30,7 @@ class Master(MiniSoC, AMPSoC):
"timer_kernel": 0x10000000, "timer_kernel": 0x10000000,
"rtio": 0x20000000, "rtio": 0x20000000,
"rtio_dma": 0x30000000, "rtio_dma": 0x30000000,
"drtio_aux": 0x60000000, "drtio_aux": 0x50000000,
"mailbox": 0x70000000 "mailbox": 0x70000000
} }
mem_map.update(MiniSoC.mem_map) mem_map.update(MiniSoC.mem_map)

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

@ -126,7 +126,7 @@ fmc_clock_io = [
class Satellite(BaseSoC): class Satellite(BaseSoC):
mem_map = { mem_map = {
"drtio_aux": 0x60000000, "drtio_aux": 0x50000000,
} }
mem_map.update(BaseSoC.mem_map) mem_map.update(BaseSoC.mem_map)