Skip to content

Commit 064d628

Browse files
committed
Updated component.xml generator
1 parent 7e6fe4c commit 064d628

File tree

3 files changed

+31
-27
lines changed

3 files changed

+31
-27
lines changed

veriloggen/types/componentgen.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
'ARCACHE', 'ARPROT', 'ARQOS', 'ARUSER', 'ARVALID', 'ARREADY',
1919
'RID', 'RDATA', 'RRESP', 'RLAST', 'RUSER', 'RVALID', 'RREADY')
2020

21-
PORTLITELIST = ('AWADDR', 'AWPROT', 'AWVALID', 'AWREADY',
21+
PORTLITELIST = ('AWADDR', 'AWCACHE', 'AWPROT', 'AWVALID', 'AWREADY',
2222
'WDATA', 'WSTRB', 'WVALID', 'WREADY',
2323
'BRESP', 'BVALID', 'BREADY',
24-
'ARADDR', 'ARPROT', 'ARVALID', 'ARREADY',
24+
'ARADDR', 'ARCACHE', 'ARPROT', 'ARVALID', 'ARREADY',
2525
'RDATA', 'RRESP', 'RVALID', 'RREADY')
2626

2727

@@ -134,12 +134,12 @@ def mkBusInterfaces(self):
134134
for bus_interface in self.bus_interfaces:
135135
bus.appendChild(self.mkBusInterface(bus_interface))
136136

137-
for clk_name, assoc_rsts in self.clk_ports.items():
138-
bus.appendChild(self.mkBusInterfaceClock(clk_name, assoc_rsts))
139-
140137
for rst_name, rst_polarity in self.rst_ports.items():
141138
bus.appendChild(self.mkBusInterfaceReset(rst_name, rst_polarity))
142139

140+
for clk_name, assoc_rsts in self.clk_ports.items():
141+
bus.appendChild(self.mkBusInterfaceClock(clk_name, assoc_rsts))
142+
143143
return bus
144144

145145
def mkBusInterface(self, obj):
@@ -155,7 +155,7 @@ def mkBusInterface(self, obj):
155155
else:
156156
interface.appendChild(self.mkSlave(name))
157157
interface.appendChild(self.mkPortMaps(obj))
158-
interface.appendChild(self.mkBusParameters(name, datawidth, master))
158+
#interface.appendChild(self.mkBusParameters(name, datawidth, master))
159159
return interface
160160

161161
def mkBusType(self):
@@ -476,7 +476,7 @@ def mkAddressSpace(self, obj):
476476
self.setText(width, width_value)
477477
space.appendChild(width)
478478

479-
space.appendChild(self.mkAddressSpaceParameters(name))
479+
#space.appendChild(self.mkAddressSpaceParameters(name))
480480
return space
481481

482482
def mkAddressSpaceParameters(self, name):

veriloggen/types/ipxact.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@ def to_ipxact(m, ip_name=None, ip_ver='1.0',
3535

3636
verilogname = ip_name + '.v'
3737
xmlname = 'component.xml'
38-
xdcname = ip_name + '.xdc'
39-
bdname = 'bd.tcl'
38+
#xdcname = ip_name + '.xdc'
39+
#bdname = 'bd.tcl'
4040
xguiname = 'xgui.tcl'
4141

4242
verilogpath = dirname + 'hdl/verilog/'
4343
xmlpath = dirname
44-
xdcpath = dirname + 'data/'
45-
bdpath = dirname + 'bd/'
44+
#xdcpath = dirname + 'data/'
45+
#bdpath = dirname + 'bd/'
4646
xguipath = dirname + 'xgui/'
4747

4848
if not os.path.exists(dirname):
4949
os.mkdir(dirname)
50-
if not os.path.exists(dirname + '/' + 'data'):
51-
os.mkdir(dirname + '/' + 'data')
52-
if not os.path.exists(dirname + '/' + 'bd'):
53-
os.mkdir(dirname + '/' + 'bd')
50+
#if not os.path.exists(dirname + '/' + 'data'):
51+
# os.mkdir(dirname + '/' + 'data')
52+
#if not os.path.exists(dirname + '/' + 'bd'):
53+
# os.mkdir(dirname + '/' + 'bd')
5454
if not os.path.exists(dirname + '/' + 'xgui'):
5555
os.mkdir(dirname + '/' + 'xgui')
5656
if not os.path.exists(dirname + '/' + 'hdl'):
@@ -102,19 +102,19 @@ def to_ipxact(m, ip_name=None, ip_ver='1.0',
102102
f.write(xml_code)
103103
f.close()
104104

105-
# xdc
106-
xdc_code = open(TEMPLATE_DIR + 'ipxact.xdc', 'r').read()
105+
## xdc
106+
#xdc_code = open(TEMPLATE_DIR + 'ipxact.xdc', 'r').read()
107107

108-
f = open(xdcpath + xdcname, 'w')
109-
f.write(xdc_code)
110-
f.close()
108+
#f = open(xdcpath + xdcname, 'w')
109+
#f.write(xdc_code)
110+
#f.close()
111111

112-
# bd
113-
bd_code = open(TEMPLATE_DIR + 'bd.tcl', 'r').read()
112+
## bd
113+
#bd_code = open(TEMPLATE_DIR + 'bd.tcl', 'r').read()
114114

115-
f = open(bdpath + bdname, 'w')
116-
f.write(bd_code)
117-
f.close()
115+
#f = open(bdpath + bdname, 'w')
116+
#f.write(bd_code)
117+
#f.close()
118118

119119
# xgui file
120120
xgui_code = open(TEMPLATE_DIR + 'xgui_tcl.txt', 'r').read()
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
12
proc init_gui { IPINST } {
2-
set Page0 [ipgui::add_page $IPINST -name "Page 0" -layout vertical]
3-
set Component_Name [ipgui::add_param $IPINST -parent $Page0 -name Component_Name]
3+
ipgui::add_param $IPINST -name "Component_Name"
4+
#Adding Page
5+
ipgui::add_page $IPINST -name "Page 0"
6+
7+
48
}

0 commit comments

Comments
 (0)