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

Fix missing string replace. Added support for 32-bit ISE if 64-bit version is missing on 64-bit system.

This commit is contained in:
user 2013-08-07 18:26:40 +02:00 committed by Sebastien Bourdeauducq
parent 6e64016885
commit 9d531ba06a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mibuild/xilinx_ise.py
View File

@ -103,7 +103,11 @@ def _run_ise(build_name, ise_path, source, mode="verilog"):
vers = [ver for ver in os.listdir(ise_path) if _is_valid_version(ise_path, ver)] vers = [ver for ver in os.listdir(ise_path) if _is_valid_version(ise_path, ver)]
tools_version = max(vers) tools_version = max(vers)
bits = struct.calcsize("P")*8 bits = struct.calcsize("P")*8
xilinx_settings_file = '%s/%s/ISE_DS/settings%d.sh' % (ise_path, tools_version, bits) xilinx_settings_file = '%s/%s/ISE_DS/settings%d.sh' % (ise_path, tools_version, bits)
if not os.path.exists(xilinx_settings_file) and bits == 64:
# if we are on 64-bit system but the toolchain isn't, try the 32-bit env.
xilinx_settings_file = '%s/%s/ISE_DS/settings%d.sh' % (ise_path, tools_version, 32)
build_script_contents += "source " + xilinx_settings_file + "\n" build_script_contents += "source " + xilinx_settings_file + "\n"
if mode == "edif": if mode == "edif":
build_script_contents += """ build_script_contents += """
@ -111,7 +115,7 @@ ngdbuild -uc {build_name}.ucf {build_name}.edif {build_name}.ngd""".format(build
else: else:
build_script_contents += """ build_script_contents += """
xst -ifn {build_name}.xst xst -ifn {build_name}.xst
ngdbuild -uc {build_name}.ucf {build_name}.ngc {build_name}.ngd""" ngdbuild -uc {build_name}.ucf {build_name}.ngc {build_name}.ngd""".format(build_name=build_name)
build_script_contents += """ build_script_contents += """
map -ol high -w -o {build_name}_map.ncd {build_name}.ngd {build_name}.pcf map -ol high -w -o {build_name}_map.ncd {build_name}.ngd {build_name}.pcf