build/xilinx/ise: Fix Yosys flow

This commit is contained in:
Christian Klarhorst 2022-07-05 16:12:41 +02:00
parent 5796f30b18
commit 30a7a1cf16
1 changed files with 4 additions and 5 deletions

View File

@ -44,13 +44,12 @@ class XilinxISEToolchain(GenericToolchain):
self.bitgen_opt = "-g Binary:Yes -w" self.bitgen_opt = "-g Binary:Yes -w"
self.ise_commands = "" self.ise_commands = ""
self.mode = "xst" self.mode = "xst"
self.isemode = "xst" self._isemode = "xst"
def build(self, platform, fragment, def build(self, platform, fragment,
mode = "xst", mode = "xst",
**kwargs): **kwargs):
self.mode = mode
self._mode = mode
self._isemode = mode if mode in ["xst", "cpld"] else "edif" self._isemode = mode if mode in ["xst", "cpld"] else "edif"
return GenericToolchain.build(self, platform, fragment, **kwargs) return GenericToolchain.build(self, platform, fragment, **kwargs)
@ -118,11 +117,11 @@ class XilinxISEToolchain(GenericToolchain):
# Yosys Run ---------------------------------------------------------------------------------------- # Yosys Run ----------------------------------------------------------------------------------------
def _run_yosys(build_name): def _run_yosys(self):
device = self.platform.device device = self.platform.device
ys_contents = "" ys_contents = ""
incflags = "" incflags = ""
for path in platform.verilog_include_paths: for path in self.platform.verilog_include_paths:
incflags += " -I" + path incflags += " -I" + path
for filename, language, library, *copy in self.platform.sources: for filename, language, library, *copy in self.platform.sources:
ys_contents += "read_{}{} {}\n".format(language, incflags, filename) ys_contents += "read_{}{} {}\n".format(language, incflags, filename)