projects
/
pinmux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
split out memory map defines
[pinmux.git]
/
src
/
bsv
/
pinmux_generator.py
diff --git
a/src/bsv/pinmux_generator.py
b/src/bsv/pinmux_generator.py
index fbe19736ec6e02ccd6081bcf08a801637ac380e0..b351bf287a6146999d21e65f00e53bf2b24630cf 100644
(file)
--- a/
src/bsv/pinmux_generator.py
+++ b/
src/bsv/pinmux_generator.py
@@
-87,10
+87,16
@@
def pinmuxgen(pth=None, verify=True):
idef = os.path.join(bp, 'instance_defines.bsv')
slow = os.path.join(bp, 'slow_peripherals.bsv')
slowt = os.path.join(cwd, 'slow_peripherals_template.bsv')
idef = os.path.join(bp, 'instance_defines.bsv')
slow = os.path.join(bp, 'slow_peripherals.bsv')
slowt = os.path.join(cwd, 'slow_peripherals_template.bsv')
+
slowmf = os.path.join(bp, 'slow_memory_map.bsv')
slowmt = os.path.join(cwd, 'slow_tuple2_template.bsv')
slowmf = os.path.join(bp, 'slow_memory_map.bsv')
slowmt = os.path.join(cwd, 'slow_tuple2_template.bsv')
+
+ slowid = os.path.join(bp, 'slow_instance_defines.bsv')
+ slowit = os.path.join(cwd, 'slow_instance_defines_template.bsv')
+
fastmf = os.path.join(bp, 'fast_memory_map.bsv')
fastmt = os.path.join(cwd, 'fast_tuple2_template.bsv')
fastmf = os.path.join(bp, 'fast_memory_map.bsv')
fastmt = os.path.join(cwd, 'fast_tuple2_template.bsv')
+
soc = os.path.join(bp, 'socgen.bsv')
soct = os.path.join(cwd, 'soc_template.bsv')
soc = os.path.join(bp, 'socgen.bsv')
soct = os.path.join(cwd, 'soc_template.bsv')
@@
-98,11
+104,11
@@
def pinmuxgen(pth=None, verify=True):
write_bvp(bvp, p, ifaces)
write_bus(bus, p, ifaces)
write_instances(idef, p, ifaces)
write_bvp(bvp, p, ifaces)
write_bus(bus, p, ifaces)
write_instances(idef, p, ifaces)
- write_slow(slow, slowt, slowmf, slowmt, p, ifaces, iocells)
+ write_slow(slow, slowt, slowmf, slowmt,
slowid, slowit,
p, ifaces, iocells)
write_soc(soc, soct, fastmf, fastmt, p, ifaces, iocells)
write_soc(soc, soct, fastmf, fastmt, p, ifaces, iocells)
-def write_slow(slow, slowt, slowmf, slowmt, p, ifaces, iocells):
+def write_slow(slow, slowt, slowmf, slowmt,
slowid, slowit,
p, ifaces, iocells):
""" write out the slow_peripherals.bsv file.
joins all the peripherals together into one AXI Lite interface
"""
""" write out the slow_peripherals.bsv file.
joins all the peripherals together into one AXI Lite interface
"""
@@
-132,10
+138,15
@@
def write_slow(slow, slowt, slowmf, slowmt, p, ifaces, iocells):
numsloirqs, ifacedef,
inst2, clockcon))
numsloirqs, ifacedef,
inst2, clockcon))
+ with open(slowid, "w") as bsv_file:
+ with open(slowit) as f:
+ slowit = f.read()
+ bsv_file.write(slowit.format(regdef))
+
with open(slowmf, "w") as bsv_file:
with open(slowmt) as f:
slowmt = f.read()
with open(slowmf, "w") as bsv_file:
with open(slowmt) as f:
slowmt = f.read()
- bsv_file.write(slowmt.format(
regdef, slavedecl, fnaddrmap
))
+ bsv_file.write(slowmt.format(
fnaddrmap, slavedecl
))
def write_soc(soc, soct, fastmf, fastmt, p, ifaces, iocells):
def write_soc(soc, soct, fastmf, fastmt, p, ifaces, iocells):