nexus: Allow selection of toolchain
Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
parent
b9d9af3183
commit
11fa5c34ac
|
@ -249,9 +249,9 @@ class Platform(LatticePlatform):
|
|||
default_clk_name = "clk12"
|
||||
default_clk_period = 1e9/12e6
|
||||
|
||||
def __init__(self, device="LIFCL", **kwargs):
|
||||
def __init__(self, device="LIFCL", toolchain="radiant", **kwargs):
|
||||
assert device in ["LIFCL"]
|
||||
LatticePlatform.__init__(self, device + "-40-9BG400C", _io, _connectors, toolchain="radiant", **kwargs)
|
||||
LatticePlatform.__init__(self, device + "-40-9BG400C", _io, _connectors, toolchain=toolchain, **kwargs)
|
||||
|
||||
def create_programmer(self, mode = "direct"):
|
||||
assert mode in ["direct","flash"]
|
||||
|
|
|
@ -202,9 +202,9 @@ class Platform(LatticePlatform):
|
|||
default_clk_name = "clk12"
|
||||
default_clk_period = 1e9/12e6
|
||||
|
||||
def __init__(self, device="LIFCL", **kwargs):
|
||||
def __init__(self, device="LIFCL", toolchain="radiant", **kwargs):
|
||||
assert device in ["LIFCL"]
|
||||
LatticePlatform.__init__(self, device + "-40-9BG400C", _io, _connectors, toolchain="radiant", **kwargs)
|
||||
LatticePlatform.__init__(self, device + "-40-9BG400C", _io, _connectors, toolchain=toolchain, **kwargs)
|
||||
|
||||
def create_programmer(self, mode = "direct"):
|
||||
assert mode in ["direct","flash"]
|
||||
|
|
|
@ -26,6 +26,8 @@ from litex.soc.integration.soc_core import *
|
|||
from litex.soc.integration.builder import *
|
||||
from litex.soc.cores.led import LedChaser
|
||||
|
||||
from litex.build.lattice.oxide import oxide_args, oxide_argdict
|
||||
|
||||
kB = 1024
|
||||
mB = 1024*kB
|
||||
|
||||
|
@ -66,8 +68,8 @@ class BaseSoC(SoCCore):
|
|||
"sram": 0x40000000,
|
||||
"csr": 0xf0000000,
|
||||
}
|
||||
def __init__(self, sys_clk_freq=int(75e6), **kwargs):
|
||||
platform = crosslink_nx_evn.Platform()
|
||||
def __init__(self, sys_clk_freq=int(75e6), toolchain="radiant", **kwargs):
|
||||
platform = crosslink_nx_evn.Platform(toolchain=toolchain)
|
||||
platform.add_platform_command("ldc_set_sysconfig {{MASTER_SPI_PORT=SERIAL}}")
|
||||
|
||||
# Disable Integrated SRAM since we want to instantiate LRAM specifically for it
|
||||
|
@ -103,19 +105,22 @@ def main():
|
|||
parser = argparse.ArgumentParser(description="LiteX SoC on Crosslink-NX Eval Board")
|
||||
parser.add_argument("--build", action="store_true", help="Build bitstream")
|
||||
parser.add_argument("--load", action="store_true", help="Load bitstream")
|
||||
parser.add_argument("--toolchain", default="radiant", help="FPGA toolchain: radiant (default) or prjoxide")
|
||||
parser.add_argument("--sys-clk-freq", default=75e6, help="System clock frequency (default: 75MHz)")
|
||||
parser.add_argument("--serial", default="serial", help="UART Pins: serial (default, requires R15 and R17 to be soldered) or serial_pmod[0-2]")
|
||||
parser.add_argument("--prog-target", default="direct", help="Programming Target: direct or flash")
|
||||
builder_args(parser)
|
||||
soc_core_args(parser)
|
||||
oxide_args(parser)
|
||||
args = parser.parse_args()
|
||||
|
||||
soc = BaseSoC(
|
||||
sys_clk_freq = int(float(args.sys_clk_freq)),
|
||||
toolchain = args.toolchain,
|
||||
**soc_core_argdict(args)
|
||||
)
|
||||
builder = Builder(soc, **builder_argdict(args))
|
||||
builder_kargs = {}
|
||||
builder_kargs = oxide_argdict(args) if args.toolchain == "oxide" else {}
|
||||
builder.build(**builder_kargs, run=args.build)
|
||||
|
||||
if args.load:
|
||||
|
|
|
@ -31,6 +31,8 @@ from litex.soc.integration.soc_core import *
|
|||
from litex.soc.integration.builder import *
|
||||
from litex.soc.cores.led import LedChaser
|
||||
|
||||
from litex.build.lattice.oxide import oxide_args, oxide_argdict
|
||||
|
||||
kB = 1024
|
||||
mB = 1024*kB
|
||||
|
||||
|
@ -67,8 +69,8 @@ class BaseSoC(SoCCore):
|
|||
"sram": 0x40000000,
|
||||
"csr": 0xf0000000,
|
||||
}
|
||||
def __init__(self, sys_clk_freq=int(75e6), hyperram="none", **kwargs):
|
||||
platform = crosslink_nx_vip.Platform()
|
||||
def __init__(self, sys_clk_freq=int(75e6), hyperram="none", toolchain="radiant", **kwargs):
|
||||
platform = crosslink_nx_vip.Platform(toolchain=toolchain)
|
||||
platform.add_platform_command("ldc_set_sysconfig {{MASTER_SPI_PORT=SERIAL}}")
|
||||
|
||||
# Disable Integrated SRAM since we want to instantiate LRAM specifically for it
|
||||
|
@ -108,20 +110,23 @@ def main():
|
|||
parser = argparse.ArgumentParser(description="LiteX SoC on Crosslink-NX VIP Board")
|
||||
parser.add_argument("--build", action="store_true", help="Build bitstream")
|
||||
parser.add_argument("--load", action="store_true", help="Load bitstream")
|
||||
parser.add_argument("--toolchain", default="radiant", help="FPGA toolchain: radiant (default) or prjoxide")
|
||||
parser.add_argument("--sys-clk-freq", default=75e6, help="System clock frequency (default: 75MHz)")
|
||||
parser.add_argument("--with-hyperram", default="none", help="Enable use of HyperRAM chip: none (default), 0 or 1")
|
||||
parser.add_argument("--prog-target", default="direct", help="Programming Target: direct (default) or flash")
|
||||
builder_args(parser)
|
||||
soc_core_args(parser)
|
||||
oxide_args(parser)
|
||||
args = parser.parse_args()
|
||||
|
||||
soc = BaseSoC(
|
||||
sys_clk_freq = int(float(args.sys_clk_freq)),
|
||||
hyperram = args.with_hyperram,
|
||||
toolchain = args.toolchain,
|
||||
**soc_core_argdict(args)
|
||||
)
|
||||
builder = Builder(soc, **builder_argdict(args))
|
||||
builder_kargs = {}
|
||||
builder_kargs = oxide_argdict(args) if args.toolchain == "oxide" else {}
|
||||
builder.build(**builder_kargs, run=args.build)
|
||||
|
||||
if args.load:
|
||||
|
|
Loading…
Reference in New Issue