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

efinix_xyloni_dev_kit: Increase similarities with others boards and make target very similar to iceBreaker/Fomu/TangNano4k.

This commit is contained in:
Florent Kermarrec 2021-10-21 11:34:55 +02:00
parent dc1328f1a5
commit 75fd276dbe
2 changed files with 43 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
litex_boards/platforms/efinix_xyloni_dev_kit.py
View File

@ -25,15 +25,6 @@ _io = [
IOStandard("3.3_V_LVTTL_/_LVCMOS") IOStandard("3.3_V_LVTTL_/_LVCMOS")
), ),
("spiflash2x", 0,
Subsignal("cs_n", Pins("J4")), # net SPI_SS
Subsignal("clk", Pins("H4")), # net SPI_SCLK
Subsignal("dq", Pins("F4 H3")), # DI DO nets SPI_MOSI, SPI_MISO
#Subsignal("wp", Pins("")),
#Subsignal("hold", Pins("")),
IOStandard("3.3_V_LVTTL_/_LVCMOS")
),
# SDCard # SDCard
("spisdcard", 0, ("spisdcard", 0,
# all 4 SPI signals below have 10k pullup on dev board # all 4 SPI signals below have 10k pullup on dev board
@ -47,20 +38,14 @@ _io = [
), ),
# Leds # nets LED1-4 # Leds # nets LED1-4
("user_led", 0, Pins("B3"), IOStandard( ("user_led", 0, Pins("B3"), IOStandard("3.3_V_LVTTL_/_LVCMOS"), Misc("DRIVE_STRENGTH=3")),
"3.3_V_LVTTL_/_LVCMOS"), Misc("DRIVE_STRENGTH=3")), ("user_led", 1, Pins("J6"), IOStandard("3.3_V_LVTTL_/_LVCMOS"), Misc("DRIVE_STRENGTH=3")),
("user_led", 1, Pins("J6"), IOStandard( ("user_led", 2, Pins("D7"), IOStandard("3.3_V_LVTTL_/_LVCMOS"), Misc("DRIVE_STRENGTH=3")),
"3.3_V_LVTTL_/_LVCMOS"), Misc("DRIVE_STRENGTH=3")), ("user_led", 3, Pins("D8"), IOStandard("3.3_V_LVTTL_/_LVCMOS"), Misc("DRIVE_STRENGTH=3")),
("user_led", 2, Pins("D7"), IOStandard(
"3.3_V_LVTTL_/_LVCMOS"), Misc("DRIVE_STRENGTH=3")),
("user_led", 3, Pins("D8"), IOStandard(
"3.3_V_LVTTL_/_LVCMOS"), Misc("DRIVE_STRENGTH=3")),
# Buttons nets BTN1-2 # Buttons nets BTN1-2
("user_btn", 0, Pins("C5"), IOStandard( ("user_btn", 0, Pins("C5"), IOStandard("3.3_V_LVTTL_/_LVCMOS"), Misc("WEAK_PULLUP")),
"3.3_V_LVTTL_/_LVCMOS"), Misc("WEAK_PULLUP")), ("user_btn", 1, Pins("C9"), IOStandard("3.3_V_LVTTL_/_LVCMOS"), Misc("WEAK_PULLUP")),
("user_btn", 1, Pins("C9"), IOStandard(
"3.3_V_LVTTL_/_LVCMOS"), Misc("WEAK_PULLUP")),
# Serial / PMOD USB-UART on PMOD E. # Serial / PMOD USB-UART on PMOD E.
("serial", 0, ("serial", 0,
@ -84,19 +69,16 @@ _connectors = [
# Platform ----------------------------------------------------------------------------------------- # Platform -----------------------------------------------------------------------------------------
class Platform(EfinixPlatform): class Platform(EfinixPlatform):
default_clk_name = "clk33" default_clk_name = "clk33"
default_clk_period = 1e9/33.333e6 default_clk_period = 1e9/33.333e6
def __init__(self): def __init__(self):
EfinixPlatform.__init__(self, "T8F81C2", _io, EfinixPlatform.__init__(self, "T8F81C2", _io, _connectors, toolchain="efinity")
_connectors, toolchain="efinity")
def create_programmer(self): def create_programmer(self):
return EfinixProgrammer() return EfinixProgrammer()
def do_finalize(self, fragment): def do_finalize(self, fragment):
EfinixPlatform.do_finalize(self, fragment) EfinixPlatform.do_finalize(self, fragment)
self.add_period_constraint(self.lookup_request( self.add_period_constraint(self.lookup_request("clk33", loose=True), 1e9/33.333e6)
"clk33", loose=True), 1e9/33.333e6)

94
litex_boards/targets/efinix_xyloni_dev_kit.py
View File

@ -21,8 +21,10 @@ from litex.soc.integration.soc import SoCRegion
from litex.soc.integration.builder import * from litex.soc.integration.builder import *
from litex.soc.cores.led import LedChaser from litex.soc.cores.led import LedChaser
# CRG ---------------------------------------------------------------------------------------------- kB = 1024
mB = 1024*kB
# CRG ----------------------------------------------------------------------------------------------
class _CRG(Module): class _CRG(Module):
def __init__(self, platform, sys_clk_freq): def __init__(self, platform, sys_clk_freq):
@ -45,105 +47,79 @@ class _CRG(Module):
# BaseSoC ------------------------------------------------------------------------------------------ # BaseSoC ------------------------------------------------------------------------------------------
class BaseSoC(SoCCore): class BaseSoC(SoCCore):
mem_map = {**{"sram": 0x01000000}, **{"spiflash": 0x80000000}} mem_map = {**SoCCore.mem_map, **{"spiflash": 0x80000000}}
def __init__(self, bios_flash_offset, sys_clk_freq, with_led_chaser=True, **kwargs):
def __init__(self, sys_clk_freq, bios_flash_offset, with_uartbone=False, with_spi_flash=False, with_led_chaser=True, **kwargs):
platform = efinix_xyloni_dev_kit.Platform() platform = efinix_xyloni_dev_kit.Platform()
# SoCCore ---------------------------------------------------------------------------------- # Disable Integrated ROM since too large for this device.
kwargs["integrated_sram_size"] = 0xC00 kwargs["integrated_rom_size"] = 0
# kwargs["integrated_rom_size"] = 0x6000 # doesn't fit
kwargs["integrated_rom_size"] = 0
# Set CPU variant / reset address # Set CPU variant / reset address
if with_spi_flash: kwargs["cpu_variant"] = "minimal"
kwargs["cpu_reset_address"] = self.mem_map["spiflash"] + \ kwargs["cpu_reset_address"] = self.mem_map["spiflash"] + bios_flash_offset
bios_flash_offset
# Can probably only support minimal variant of vexriscv
if kwargs.get("cpu_type", "vexriscv") == "vexriscv":
kwargs["cpu_variant"] = "minimal"
# SoCCore ----------------------------------------------------------------------------------
SoCCore.__init__(self, platform, sys_clk_freq, SoCCore.__init__(self, platform, sys_clk_freq,
ident="LiteX SoC on Efinix Xyloni Dev Kit", #ident = "LiteX SoC on Efinix Xyloni Dev Kit", # FIXME: Crash design.
ident_version=True, #ident_version = True,
integrated_rom_no_we=True, # FIXME: Avoid this. integrated_rom_no_we = True, # FIXME: Avoid this.
integrated_sram_no_we=True, # FIXME: Avoid this. integrated_sram_no_we = True, # FIXME: Avoid this.
integrated_main_ram_no_we=True, # FIXME: Avoid this. integrated_main_ram_no_we = True, # FIXME: Avoid this.
**kwargs) **kwargs)
# CRG -------------------------------------------------------------------------------------- # CRG --------------------------------------------------------------------------------------
self.submodules.crg = _CRG(platform, sys_clk_freq) self.submodules.crg = _CRG(platform, sys_clk_freq)
# SPI Flash -------------------------------------------------------------------------------- # SPI Flash --------------------------------------------------------------------------------
if with_spi_flash: from litespi.modules import W25Q128JV
from litespi.modules import W25Q128JV from litespi.opcodes import SpiNorFlashOpCodes as Codes
from litespi.opcodes import SpiNorFlashOpCodes as Codes self.add_spi_flash(mode="1x", module=W25Q128JV(Codes.READ_1_1_1), with_master=False)
self.add_spi_flash(mode="1x", module=W25Q128JV(
Codes.READ_1_1_1), with_master=True)
# Add ROM linker region -------------------------------------------------------------------- # Add ROM linker region --------------------------------------------------------------------
self.bus.add_region("rom", SoCRegion( self.bus.add_region("rom", SoCRegion(
origin=self.mem_map["spiflash"] + bios_flash_offset, origin = self.mem_map["spiflash"] + bios_flash_offset,
size=32*1024, size = 32*kB,
linker=True) linker = True)
) )
# UartBone ---------------------------------------------------------------------------------
if with_uartbone:
self.add_uartbone("serial", baudrate=1e6)
# Leds ------------------------------------------------------------------------------------- # Leds -------------------------------------------------------------------------------------
if with_led_chaser: if with_led_chaser:
self.submodules.leds = LedChaser( self.submodules.leds = LedChaser(
pads=platform.request_all("user_led"), pads = platform.request_all("user_led"),
sys_clk_freq=sys_clk_freq) sys_clk_freq = sys_clk_freq)
# Build -------------------------------------------------------------------------------------------- # Build --------------------------------------------------------------------------------------------
def main(): def main():
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(description="LiteX SoC on Efinix Xyloni Dev Kit")
description="LiteX SoC on Efinix Xyloni Dev Kit")
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("--flash", action="store_true", help="Flash Bitstream") parser.add_argument("--flash", action="store_true", help="Flash Bitstream")
# TODO: try a differnet frequency when PLL is supported parser.add_argument("--sys-clk-freq", default=33.333e6, help="System clock frequency (default: 33.333MHz)")
parser.add_argument("--sys-clk-freq", default=33.333e6, parser.add_argument("--bios-flash-offset", default=0x40000, help="BIOS offset in SPI Flash (default: 0x40000)")
help="System clock frequency (default: 33.333MHz)")
parser.add_argument("--with-uartbone", action="store_true",
help="Enable Uartbone support")
parser.add_argument("--with-spi-flash", action="store_true",
help="Enable SPI Flash (MMAPed)")
parser.add_argument("--bios-flash-offset", default=0x40000,
help="BIOS offset in SPI Flash (default: 0x40000)")
builder_args(parser) builder_args(parser)
soc_core_args(parser) soc_core_args(parser)
args = parser.parse_args() args = parser.parse_args()
soc = BaseSoC( soc = BaseSoC(
int(float(args.sys_clk_freq)), bios_flash_offset = args.bios_flash_offset,
bios_flash_offset=args.bios_flash_offset, sys_clk_freq = int(float(args.sys_clk_freq)),
with_uartbone=args.with_uartbone,
with_spi_flash=args.with_spi_flash,
**soc_core_argdict(args)) **soc_core_argdict(args))
builder = Builder(soc, **builder_argdict(args)) builder = Builder(soc, **builder_argdict(args))
builder.build(run=args.build) builder.build(run=args.build)
if args.load: if args.load:
prog = soc.platform.create_programmer() prog = soc.platform.create_programmer()
prog.load_bitstream(os.path.join( prog.load_bitstream(os.path.join(builder.gateware_dir, f"outflow/{soc.build_name}.bit"))
builder.gateware_dir, f"outflow/{soc.build_name}.bit"))
if args.flash: if args.flash:
from litex.build.openfpgaloader import OpenFPGALoader from litex.build.openfpgaloader import OpenFPGALoader
prog = OpenFPGALoader("xyloni_spi") prog = OpenFPGALoader("xyloni_spi")
prog.flash(0, os.path.join(builder.gateware_dir, prog.flash(0, os.path.join(builder.gateware_dir, f"outflow/{soc.build_name}.hex"))
f"outflow/{soc.build_name}.hex")) prog.flash(args.bios_flash_offset, os.path.join(builder.software_dir, "bios/bios.bin"))
if __name__ == "__main__": if __name__ == "__main__":
main() main()