Fix format
This commit is contained in:
parent
0c774a906d
commit
70f2fd6368
|
@ -55,14 +55,13 @@ class Platform(LatticePlatform):
|
||||||
assert device in ["LIFCL-40-9BG256C", "LIFCL-40-9BG400C", "LIFCL-40-8BG400CES", "LIFCL-40-8BG400CES2", "LIFCL-40-8BG400C"]
|
assert device in ["LIFCL-40-9BG256C", "LIFCL-40-9BG400C", "LIFCL-40-8BG400CES", "LIFCL-40-8BG400CES2", "LIFCL-40-8BG400C"]
|
||||||
LatticePlatform.__init__(self, device, _io, _connectors, toolchain=toolchain, **kwargs)
|
LatticePlatform.__init__(self, device, _io, _connectors, toolchain=toolchain, **kwargs)
|
||||||
|
|
||||||
def create_programmer(self, mode = "direct", prog="radiant"):
|
def create_programmer(self, mode="direct", prog="radiant"):
|
||||||
assert mode in ["direct","flash"]
|
assert mode in ["direct", "flash"]
|
||||||
assert prog in ["radiant","ecpprog"]
|
assert prog in ["radiant", "ecpprog"]
|
||||||
|
|
||||||
if prog == "ecpprog":
|
if prog == "ecpprog":
|
||||||
return EcpprogProgrammer()
|
return EcpprogProgrammer()
|
||||||
|
|
||||||
|
|
||||||
xcf_template_direct = """<?xml version='1.0' encoding='utf-8' ?>
|
xcf_template_direct = """<?xml version='1.0' encoding='utf-8' ?>
|
||||||
<!DOCTYPE ispXCF SYSTEM "IspXCF.dtd" >
|
<!DOCTYPE ispXCF SYSTEM "IspXCF.dtd" >
|
||||||
<ispXCF version="R1.2.0">
|
<ispXCF version="R1.2.0">
|
||||||
|
|
|
@ -15,7 +15,6 @@ import litex_boards.platforms.antmicro_sdi_mipi_video_converter
|
||||||
|
|
||||||
from litex.soc.cores.ram import NXLRAM
|
from litex.soc.cores.ram import NXLRAM
|
||||||
from litex.soc.cores.clock import NXPLL
|
from litex.soc.cores.clock import NXPLL
|
||||||
from litex.build.io import CRG
|
|
||||||
from litex.build.generic_platform import *
|
from litex.build.generic_platform import *
|
||||||
|
|
||||||
from litex.soc.cores.clock import *
|
from litex.soc.cores.clock import *
|
||||||
|
@ -53,21 +52,22 @@ class _CRG(Module):
|
||||||
self.submodules.sys_pll = sys_pll = NXPLL(platform=platform, create_output_port_clocks=True)
|
self.submodules.sys_pll = sys_pll = NXPLL(platform=platform, create_output_port_clocks=True)
|
||||||
sys_pll.register_clkin(self.cd_por.clk, hf_clk_freq)
|
sys_pll.register_clkin(self.cd_por.clk, hf_clk_freq)
|
||||||
sys_pll.create_clkout(self.cd_sys, sys_clk_freq)
|
sys_pll.create_clkout(self.cd_sys, sys_clk_freq)
|
||||||
self.specials += AsyncResetSynchronizer(self.cd_sys, ~self.sys_pll.locked | ~por_done )
|
self.specials += AsyncResetSynchronizer(self.cd_sys, ~self.sys_pll.locked | ~por_done)
|
||||||
|
|
||||||
|
|
||||||
# BaseSoC ------------------------------------------------------------------------------------------
|
# BaseSoC ------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
class BaseSoC(SoCCore):
|
class BaseSoC(SoCCore):
|
||||||
mem_map = {
|
mem_map = {
|
||||||
"rom" : 0x00000000,
|
"rom": 0x00000000,
|
||||||
"sram" : 0x40000000,
|
"sram": 0x40000000,
|
||||||
"main_ram": 0x60000000,
|
"main_ram": 0x60000000,
|
||||||
"csr" : 0xf0000000,
|
"csr": 0xf0000000,
|
||||||
}
|
}
|
||||||
|
|
||||||
def __init__(self, sys_clk_freq=int(75e6), device="LIFCL-40-9BG256C", toolchain="radiant", with_led_chaser=True, **kwargs):
|
def __init__(self, sys_clk_freq=int(75e6), device="LIFCL-40-9BG256C", toolchain="radiant", with_led_chaser=True, **kwargs):
|
||||||
platform = litex_boards.platforms.antmicro_sdi_mipi_video_converter.Platform(device=device, toolchain=toolchain)
|
platform = litex_boards.platforms.antmicro_sdi_mipi_video_converter.Platform(
|
||||||
|
device=device, toolchain=toolchain)
|
||||||
|
|
||||||
# CRG --------------------------------------------------------------------------------------
|
# CRG --------------------------------------------------------------------------------------
|
||||||
self.submodules.crg = _CRG(platform, sys_clk_freq)
|
self.submodules.crg = _CRG(platform, sys_clk_freq)
|
||||||
|
@ -76,7 +76,8 @@ class BaseSoC(SoCCore):
|
||||||
|
|
||||||
# Disable Integrated SRAM since we want to instantiate LRAM specifically for it
|
# Disable Integrated SRAM since we want to instantiate LRAM specifically for it
|
||||||
kwargs["integrated_sram_size"] = 0
|
kwargs["integrated_sram_size"] = 0
|
||||||
SoCCore.__init__(self, platform, sys_clk_freq, ident="LiteX SoC on Crosslink-NX Evaluation Board", **kwargs)
|
SoCCore.__init__(self, platform, sys_clk_freq,
|
||||||
|
ident="LiteX SoC on Crosslink-NX Evaluation Board", **kwargs)
|
||||||
|
|
||||||
# 128KB LRAM (used as SRAM) ---------------------------------------------------------------
|
# 128KB LRAM (used as SRAM) ---------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -89,11 +90,12 @@ class BaseSoC(SoCCore):
|
||||||
# Leds -------------------------------------------------------------------------------------
|
# Leds -------------------------------------------------------------------------------------
|
||||||
if with_led_chaser:
|
if with_led_chaser:
|
||||||
self.submodules.leds = LedChaser(
|
self.submodules.leds = LedChaser(
|
||||||
pads = Cat(*[platform.request("user_led", i) for i in range(2)]),
|
pads=Cat(*[platform.request("user_led", i) for i in range(2)]),
|
||||||
sys_clk_freq = sys_clk_freq)
|
sys_clk_freq=sys_clk_freq)
|
||||||
|
|
||||||
# Build --------------------------------------------------------------------------------------------
|
# Build --------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
from litex.soc.integration.soc import LiteXSoCArgumentParser
|
from litex.soc.integration.soc import LiteXSoCArgumentParser
|
||||||
parser = LiteXSoCArgumentParser(description="LiteX SoC on Crosslink-NX Eval Board")
|
parser = LiteXSoCArgumentParser(description="LiteX SoC on Crosslink-NX Eval Board")
|
||||||
|
@ -113,9 +115,9 @@ def main():
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
soc = BaseSoC(
|
soc = BaseSoC(
|
||||||
sys_clk_freq = int(float(args.sys_clk_freq)),
|
sys_clk_freq=int(float(args.sys_clk_freq)),
|
||||||
device = args.device,
|
device=args.device,
|
||||||
toolchain = args.toolchain,
|
toolchain=args.toolchain,
|
||||||
**soc_core_argdict(args)
|
**soc_core_argdict(args)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -127,7 +129,8 @@ def main():
|
||||||
if args.load:
|
if args.load:
|
||||||
prog = soc.platform.create_programmer(args.prog_target, args.programmer)
|
prog = soc.platform.create_programmer(args.prog_target, args.programmer)
|
||||||
if args.programmer == "ecpprog" and args.prog_target == "flash":
|
if args.programmer == "ecpprog" and args.prog_target == "flash":
|
||||||
prog.flash(address=args.address, bitstream=builder.get_bitstream_filename(mode="sram"))
|
prog.flash(address=args.address,
|
||||||
|
bitstream=builder.get_bitstream_filename(mode="sram"))
|
||||||
else:
|
else:
|
||||||
if args.programmer == "radiant":
|
if args.programmer == "radiant":
|
||||||
os.system("sudo modprobe -rf ftdi_sio")
|
os.system("sudo modprobe -rf ftdi_sio")
|
||||||
|
@ -137,6 +140,6 @@ def main():
|
||||||
if args.programmer == "radiant":
|
if args.programmer == "radiant":
|
||||||
os.system("sudo modprobe ftdi_sio")
|
os.system("sudo modprobe ftdi_sio")
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
main()
|
main()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue