add jtag through pinmux

[pinmux.git] / src / bsv / pinmux_generator.py

diff --git a/src/bsv/pinmux_generator.py b/src/bsv/pinmux_generator.py
index fd94028698f7f12d6b5994cc48f082476cd511bb..ae39958ed2e05a3bcb3a296fd46ca1fb41f36975 100644 (file)
--- a/src/bsv/pinmux_generator.py
+++ b/src/bsv/pinmux_generator.py
@@ -73,16 +73,18 @@ def pinmuxgen(pth=None, verify=True):
                     os.path.join(bp, 'Makefile'))
     cwd = os.path.join(cwd, 'bsv_lib')
     for fname in ['AXI4_Lite_Types.bsv', 'Semi_FIFOF.bsv',
-                  'gpio.bsv', 'mux.bsv', 
-                  'AXI4_Types.bsv', 'defined_types.bsv', 
-                  'AXI4_Fabric.bsv', 'Uart16550.bsv', 
-                  'AXI4_Lite_Fabric.bsv', 'ConcatReg.bsv', 
-                  'Uart_bs.bsv', 'RS232_modified.bsv', 
+                  'gpio.bsv', 'mux.bsv',
+                  'AXI4_Types.bsv', 'defined_types.bsv',
+                  'AXI4_Fabric.bsv', 'Uart16550.bsv',
+                  'AXI4_Lite_Fabric.bsv', 'ConcatReg.bsv',
+                  'Uart_bs.bsv', 'RS232_modified.bsv',
                   'AXI4Lite_AXI4_Bridge.bsv',
-                  'I2C_top.bsv', 'I2C_Defs.bsv', 
-                  'plic.bsv', 'Cur_Cycle.bsv', 
-                  'ClockDiv.bsv', 'axi_addr_generator.bsv', 
-                  'pwm.bsv', 'qspi.bsv', 'qspi.defs', 
+                  'I2C_top.bsv', 'I2C_Defs.bsv',
+                  'plic.bsv', 'Cur_Cycle.bsv',
+                  'ClockDiv.bsv', 'axi_addr_generator.bsv',
+                  'jtagdtm_new.bsv', 'jtagdefines.bsv',
+                  'sdcard_dummy.bsv',
+                  'pwm.bsv', 'qspi.bsv', 'qspi.defs',
                   ]:
         shutil.copyfile(os.path.join(cwd, fname),
                         os.path.join(bl, fname))
@@ -110,7 +112,7 @@ def write_slow(slow, template, p, ifaces, iocells):
     with open(template) as bsv_file:
         template = bsv_file.read()
     imports = ifaces.slowimport()
-    ifdecl = ifaces.slowifdecl()
+    ifdecl = ifaces.slowifdeclmux()
     regdef = ifaces.axi_reg_def()
     slavedecl = ifaces.axi_slave_idx()
     fnaddrmap = ifaces.axi_addr_map()
@@ -118,10 +120,11 @@ def write_slow(slow, template, p, ifaces, iocells):
     mkcon = ifaces.mk_connection()
     mkcellcon = ifaces.mk_cellconn()
     pincon = ifaces.mk_pincon()
+    inst = ifaces.slowifinstance()
     with open(slow, "w") as bsv_file:
         bsv_file.write(template.format(imports, ifdecl, regdef, slavedecl,
                                        fnaddrmap, mkslow, mkcon, mkcellcon,
-                                       pincon))
+                                       pincon, inst))
 
 
 def write_bus(bus, p, ifaces):
@@ -393,6 +396,7 @@ def write_instances(idef, p, ifaces):
 `define USERSPACE 0
 
 // TODO: work out if these are needed
+`define PWM_AXI4Lite
 `define PRFDEPTH 6
 `define VADDR 39
 `define DCACHE_BLOCK_SIZE 4