mirror of
https://github.com/saymrwulf/litex-boards.git
synced 2026-11-18 09:41:45 +00:00
digilent arty z7: allows toolchain selection (PL only)
This commit is contained in:
parent
74395ca80b
commit
dd134a4b7d
2 changed files with 11 additions and 6 deletions
|
|
@ -224,7 +224,7 @@ class Platform(XilinxPlatform):
|
||||||
default_clk_name = "clk125"
|
default_clk_name = "clk125"
|
||||||
default_clk_freq = 125e6
|
default_clk_freq = 125e6
|
||||||
|
|
||||||
def __init__(self, variant="z7-20"):
|
def __init__(self, variant="z7-20", toolchain="vivado"):
|
||||||
device = {
|
device = {
|
||||||
"z7-10": "xc7z010clg400-1",
|
"z7-10": "xc7z010clg400-1",
|
||||||
"z7-20": "xc7z020clg400-1"
|
"z7-20": "xc7z020clg400-1"
|
||||||
|
|
@ -235,7 +235,7 @@ class Platform(XilinxPlatform):
|
||||||
}[variant]
|
}[variant]
|
||||||
|
|
||||||
XilinxPlatform.__init__(self, device, _io, _connectors,
|
XilinxPlatform.__init__(self, device, _io, _connectors,
|
||||||
toolchain="vivado")
|
toolchain=toolchain)
|
||||||
self.default_clk_period = 1e9 / self.default_clk_freq
|
self.default_clk_period = 1e9 / self.default_clk_freq
|
||||||
|
|
||||||
def create_programmer(self):
|
def create_programmer(self):
|
||||||
|
|
|
||||||
|
|
@ -50,8 +50,9 @@ class _CRG(Module):
|
||||||
|
|
||||||
|
|
||||||
class BaseSoC(SoCCore):
|
class BaseSoC(SoCCore):
|
||||||
def __init__(self, variant="z7-20", sys_clk_freq=int(125e6), with_led_chaser=True, **kwargs):
|
def __init__(self, variant="z7-20", toolchain="vivado", sys_clk_freq=int(125e6),
|
||||||
platform = digilent_arty_z7.Platform(variant)
|
with_led_chaser=True, **kwargs):
|
||||||
|
platform = digilent_arty_z7.Platform(variant=variant, toolchain=toolchain)
|
||||||
|
|
||||||
if kwargs.get("cpu_type", None) == "zynq7000":
|
if kwargs.get("cpu_type", None) == "zynq7000":
|
||||||
kwargs['integrated_sram_size'] = 0
|
kwargs['integrated_sram_size'] = 0
|
||||||
|
|
@ -67,6 +68,8 @@ class BaseSoC(SoCCore):
|
||||||
|
|
||||||
# Zynq7000 Integration ---------------------------------------------------------------------
|
# Zynq7000 Integration ---------------------------------------------------------------------
|
||||||
if kwargs.get("cpu_type", None) == "zynq7000":
|
if kwargs.get("cpu_type", None) == "zynq7000":
|
||||||
|
assert toolchain == "vivado", ' not tested / specific vivado cmds'
|
||||||
|
|
||||||
preset_name = "arty_z7_20.tcl" if variant == "z7-20" else "arty_z7_10.tcl"
|
preset_name = "arty_z7_20.tcl" if variant == "z7-20" else "arty_z7_10.tcl"
|
||||||
|
|
||||||
os.system("wget http://kmf2.trabucayre.com/" + preset_name)
|
os.system("wget http://kmf2.trabucayre.com/" + preset_name)
|
||||||
|
|
@ -97,6 +100,7 @@ class BaseSoC(SoCCore):
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
parser = argparse.ArgumentParser(description="LiteX SoC on Arty Z7")
|
parser = argparse.ArgumentParser(description="LiteX SoC on Arty Z7")
|
||||||
|
parser.add_argument("--toolchain", default="vivado", help="FPGA toolchain (vivado, symbiflow or yosys+nextpnr).")
|
||||||
parser.add_argument("--build", action="store_true", help="Build bitstream.")
|
parser.add_argument("--build", action="store_true", help="Build bitstream.")
|
||||||
parser.add_argument("--load", action="store_true", help="Load bitstream.")
|
parser.add_argument("--load", action="store_true", help="Load bitstream.")
|
||||||
parser.add_argument("--variant", default="z7-20", help="Board variant (z7-20 or z7-10).")
|
parser.add_argument("--variant", default="z7-20", help="Board variant (z7-20 or z7-10).")
|
||||||
|
|
@ -109,12 +113,13 @@ def main():
|
||||||
|
|
||||||
soc = BaseSoC(
|
soc = BaseSoC(
|
||||||
variant = args.variant,
|
variant = args.variant,
|
||||||
|
toolchain = args.toolchain,
|
||||||
sys_clk_freq=int(float(args.sys_clk_freq)),
|
sys_clk_freq=int(float(args.sys_clk_freq)),
|
||||||
**soc_core_argdict(args)
|
**soc_core_argdict(args)
|
||||||
)
|
)
|
||||||
builder = Builder(soc, **builder_argdict(args))
|
builder = Builder(soc, **builder_argdict(args))
|
||||||
print(builder.compile_software)
|
builder_kwargs = vivado_build_argdict(args) if args.toolchain == "vivado" else {}
|
||||||
builder.build(**vivado_build_argdict(args), run=args.build)
|
builder.build(**builder_kwargs, run=args.build)
|
||||||
|
|
||||||
if args.load:
|
if args.load:
|
||||||
prog = soc.platform.create_programmer()
|
prog = soc.platform.create_programmer()
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue