Commits (1)
...@@ -2674,6 +2674,9 @@ struct config_bitfile bitfiles[] = {'''); ...@@ -2674,6 +2674,9 @@ struct config_bitfile bitfiles[] = {''');
bitFilesHeader.close() bitFilesHeader.close()
os.chdir(savedDir) os.chdir(savedDir)
# TODO call Vivado, now call is commented out while the Vivado project structure exported is still under consolidation.
# The minimal set of files (including the TASTE auto generated ones) for such project structure is being defined. This set shall be the minimal still sufficient input to a working synthesis.
# TODO Header file generation might be added when run-time reconfiguration tasks are addressed.
def ZynQSynthesis(bNoBitfile): def ZynQSynthesis(bNoBitfile):
savedDir = os.getcwd() savedDir = os.getcwd()
for zynqMakefile in os.popen("find . -path *VHDL-DESIGN/design/Makefile*"): for zynqMakefile in os.popen("find . -path *VHDL-DESIGN/design/Makefile*"):
...@@ -2681,9 +2684,9 @@ def ZynQSynthesis(bNoBitfile): ...@@ -2681,9 +2684,9 @@ def ZynQSynthesis(bNoBitfile):
if bNoBitfile == False: if bNoBitfile == False:
with os.popen("make") as pipe: with os.popen("make") as pipe:
status = pipe.read().strip() status = pipe.read().strip()
# Following check is hugly and error prone, since it inspects vivado log. Change to check command return code instead using something like subprocess.check_call # Following check is ugly and error prone, since it inspects Vivado log. Change to check command return code instead using something like 'subprocess.check_call'
# Extract return code out of make? or avoid using Makefiles and call directly vivado etc. # Extract return code out of make? or avoid using Makefiles and call directly Vivado etc.
if ("Generating bistream of project succeed" not in status) and ("Now we would call vivado" not in status): if ("Generating bitstream of project succeed" not in status) and ("Now we would call Vivado" not in status):
panic('Bitfile synthesis failed in "%s"' % os.getcwd()) panic('Bitfile synthesis failed in "%s"' % os.getcwd())
os.chdir(savedDir) os.chdir(savedDir)
os.chdir(savedDir) os.chdir(savedDir)
...@@ -2748,6 +2751,7 @@ def CallBambuForBrave(bNoBitfile): ...@@ -2748,6 +2751,7 @@ def CallBambuForBrave(bNoBitfile):
os.chdir(savedDir) os.chdir(savedDir)
os.chdir(savedDir) os.chdir(savedDir)
# Bambu options reused from CoRA-MBAD. As further tests are performed, such options might be tailored for the ZynQ target and design needs in question.
def CallBambuForZynQ(bNoBitfile): def CallBambuForZynQ(bNoBitfile):
if bNoBitfile == False: if bNoBitfile == False:
bambuDir = 'Bambu' bambuDir = 'Bambu'
......