Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2090 from VOGL-electronic/efinix_iobank 

build: efinix: use ifacewriter to set bank voltage
This commit is contained in:
Gwenhael Goavec-Merou 2024-10-08 09:54:20 +02:00 committed by GitHub
parent 9ad5d21231 d26994916d
commit bc3e90c93a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
litex/build/efinix/efinity.py
View File

@ -252,13 +252,14 @@ class EfinityToolchain(GenericToolchain):
self.resolve_iface_signal_names() self.resolve_iface_signal_names()
header = self.ifacewriter.header(self._build_name, self.platform.device) header = self.ifacewriter.header(self._build_name, self.platform.device)
iobank = self.ifacewriter.iobank_info(self.platform.iobank_info)
gen = self.ifacewriter.generate(self.platform.device) gen = self.ifacewriter.generate(self.platform.device)
#TODO : move this to ifacewriter #TODO : move this to ifacewriter
gpio = self._build_iface_gpio() gpio = self._build_iface_gpio()
add = "\n".join(self.additional_iface_commands) add = "\n".join(self.additional_iface_commands)
footer = self.ifacewriter.footer() footer = self.ifacewriter.footer()
tools.write_to_file("iface.py", header + gen + gpio + add + footer) tools.write_to_file("iface.py", header + iobank + gen + gpio + add + footer)
# Project configuration (.xml) ----------------------------------------------------------------- # Project configuration (.xml) -----------------------------------------------------------------
@ -325,8 +326,7 @@ class EfinityToolchain(GenericToolchain):
# Some IO blocks don't have Python API so we need to configure them # Some IO blocks don't have Python API so we need to configure them
# directly in the peri.xml file # directly in the peri.xml file
# We also need to configure the bank voltage here if self.ifacewriter.xml_blocks:
if self.ifacewriter.xml_blocks or self.platform.iobank_info:
self.ifacewriter.generate_xml_blocks() self.ifacewriter.generate_xml_blocks()
# Because the Python API is sometimes bugged, we need to tweak the generated xml # Because the Python API is sometimes bugged, we need to tweak the generated xml

19
litex/build/efinix/ifacewriter.py
View File

@ -77,9 +77,6 @@ class InterfaceWriter:
if block["type"] == "DRAM": if block["type"] == "DRAM":
self.add_dram_xml(root, block) self.add_dram_xml(root, block)
if self.platform.iobank_info:
self.add_iobank_info_xml(root, self.platform.iobank_info)
xml_string = et.tostring(root, "utf-8") xml_string = et.tostring(root, "utf-8")
reparsed = expatbuilder.parseString(xml_string, False) reparsed = expatbuilder.parseString(xml_string, False)
print_string = reparsed.toprettyxml(indent=" ") print_string = reparsed.toprettyxml(indent=" ")
@ -119,6 +116,13 @@ design.create("{2}", "{3}", "./../gateware", overwrite=True)
""" """
return header.format(self.efinity_path, "True", build_name, partnumber) return header.format(self.efinity_path, "True", build_name, partnumber)
def iobank_info(self, iobank_info):
cmd = "# ---------- IOBANK INFO ---------\n"
for name, iostd in iobank_info:
cmd += 'design.set_iobank_voltage("{0}", "{1}")\n'.format(name, iostd[:3])
cmd += "# ---------- END IOBANK INFO ---------\n\n"
return cmd
def get_block(self, name): def get_block(self, name):
for b in self.blocks: for b in self.blocks:
if b["name"] == name: if b["name"] == name:
@ -681,12 +685,3 @@ design.create("{2}", "{3}", "./../gateware", overwrite=True)
design.generate(enable_bitstream=True) design.generate(enable_bitstream=True)
# Save the configured periphery design # Save the configured periphery design
design.save()""" design.save()"""
def add_iobank_info_xml(self, root, iobank_info):
dev = root.find("efxpt:device_info", namespaces)
bank_info = dev.find("efxpt:iobank_info", namespaces)
for name, iostd in iobank_info:
for child in bank_info:
if name == child.get("name"):
child.set("iostd", iostd)