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

gsd_orangecrab: Add --without_dfu_rst argument to allow disabling reset to DFU on Button press. 

This is useful in some case where were button input is force through hardware change to force DFU to be in reset at startup.
This commit is contained in:
Florent Kermarrec 2024-03-11 17:23:42 +01:00
parent 91aff9816d
commit e980798437
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
litex_boards/targets/gsd_orangecrab.py
View File

@ -28,7 +28,7 @@ from litedram.phy import ECP5DDRPHY
# CRG --------------------------------------------------------------------------------------------- # CRG ---------------------------------------------------------------------------------------------
class _CRG(LiteXModule): class _CRG(LiteXModule):
def __init__(self, platform, sys_clk_freq, with_usb_pll=False): def __init__(self, platform, sys_clk_freq, with_usb_pll=False, with_dfu_rst=True):
self.rst = Signal() self.rst = Signal()
self.cd_por = ClockDomain() self.cd_por = ClockDomain()
self.cd_sys = ClockDomain() self.cd_sys = ClockDomain()
@ -38,7 +38,7 @@ class _CRG(LiteXModule):
# Clk / Rst # Clk / Rst
clk48 = platform.request("clk48") clk48 = platform.request("clk48")
rst_n = platform.request("usr_btn", loose=True) rst_n = platform.request("usr_btn", loose=True)
if rst_n is None: rst_n = 1 if (rst_n is None) or (not with_dfu_rst): rst_n = 1
# Power on reset # Power on reset
por_count = Signal(16, reset=2**16-1) por_count = Signal(16, reset=2**16-1)
@ -65,15 +65,15 @@ class _CRG(LiteXModule):
usb_pll.create_clkout(self.cd_usb_12, 12e6) usb_pll.create_clkout(self.cd_usb_12, 12e6)
# FPGA Reset (press usr_btn for 1 second to fallback to bootloader) # FPGA Reset (press usr_btn for 1 second to fallback to bootloader)
reset_timer = WaitTimer(48e6) if with_dfu_rst:
reset_timer = ClockDomainsRenamer("por")(reset_timer) reset_timer = WaitTimer(48e6)
self.submodules += reset_timer reset_timer = ClockDomainsRenamer("por")(reset_timer)
self.comb += reset_timer.wait.eq(~rst_n) self.submodules += reset_timer
self.comb += platform.request("rst_n").eq(~reset_timer.done) self.comb += reset_timer.wait.eq(~rst_n)
self.comb += platform.request("rst_n").eq(~reset_timer.done)
class _CRGSDRAM(LiteXModule): class _CRGSDRAM(LiteXModule):
def __init__(self, platform, sys_clk_freq, with_usb_pll=False): def __init__(self, platform, sys_clk_freq, with_usb_pll=False, with_dfu_rst=True):
self.rst = Signal() self.rst = Signal()
self.cd_init = ClockDomain() self.cd_init = ClockDomain()
self.cd_por = ClockDomain() self.cd_por = ClockDomain()
@ -89,7 +89,7 @@ class _CRGSDRAM(LiteXModule):
# Clk / Rst # Clk / Rst
clk48 = platform.request("clk48") clk48 = platform.request("clk48")
rst_n = platform.request("usr_btn", loose=True) rst_n = platform.request("usr_btn", loose=True)
if rst_n is None: rst_n = 1 if (rst_n is None) or (not with_dfu_rst): rst_n = 1
# Power on reset # Power on reset
por_count = Signal(16, reset=2**16-1) por_count = Signal(16, reset=2**16-1)
@ -135,24 +135,26 @@ class _CRGSDRAM(LiteXModule):
usb_pll.create_clkout(self.cd_usb_12, 12e6) usb_pll.create_clkout(self.cd_usb_12, 12e6)
# FPGA Reset (press usr_btn for 1 second to fallback to bootloader) # FPGA Reset (press usr_btn for 1 second to fallback to bootloader)
reset_timer = WaitTimer(48e6) if with_dfu_rst:
reset_timer = ClockDomainsRenamer("por")(reset_timer) reset_timer = WaitTimer(48e6)
self.submodules += reset_timer reset_timer = ClockDomainsRenamer("por")(reset_timer)
self.comb += reset_timer.wait.eq(~rst_n) self.submodules += reset_timer
self.comb += platform.request("rst_n").eq(~reset_timer.done) self.comb += reset_timer.wait.eq(~rst_n)
self.comb += platform.request("rst_n").eq(~reset_timer.done)
# BaseSoC ------------------------------------------------------------------------------------------ # BaseSoC ------------------------------------------------------------------------------------------
class BaseSoC(SoCCore): class BaseSoC(SoCCore):
def __init__(self, revision="0.2", device="25F", sys_clk_freq=48e6, toolchain="trellis", def __init__(self, revision="0.2", device="25F", sys_clk_freq=48e6, toolchain="trellis",
sdram_device = "MT41K64M16", sdram_device = "MT41K64M16",
with_dfu_rst = True,
with_led_chaser = True, with_led_chaser = True,
**kwargs): **kwargs):
platform = gsd_orangecrab.Platform(revision=revision, device=device ,toolchain=toolchain) platform = gsd_orangecrab.Platform(revision=revision, device=device ,toolchain=toolchain)
# CRG -------------------------------------------------------------------------------------- # CRG --------------------------------------------------------------------------------------
crg_cls = _CRGSDRAM if kwargs.get("integrated_main_ram_size", 0) == 0 else _CRG crg_cls = _CRGSDRAM if kwargs.get("integrated_main_ram_size", 0) == 0 else _CRG
self.crg = crg_cls(platform, sys_clk_freq, with_usb_pll=True) self.crg = crg_cls(platform, sys_clk_freq, with_usb_pll=True, with_dfu_rst=with_dfu_rst)
# SoCCore ---------------------------------------------------------------------------------- # SoCCore ----------------------------------------------------------------------------------
# Defaults to USB ACM through ValentyUSB. # Defaults to USB ACM through ValentyUSB.
@ -204,6 +206,7 @@ def main():
parser.add_target_argument("--device", default="25F", help="ECP5 device (25F, 45F or 85F).") parser.add_target_argument("--device", default="25F", help="ECP5 device (25F, 45F or 85F).")
parser.add_target_argument("--sdram-device", default="MT41K64M16", help="SDRAM device (MT41K64M16, MT41K128M16, MT41K256M16 or MT41K512M16).") parser.add_target_argument("--sdram-device", default="MT41K64M16", help="SDRAM device (MT41K64M16, MT41K128M16, MT41K256M16 or MT41K512M16).")
parser.add_target_argument("--with-spi-sdcard", action="store_true", help="Enable SPI-mode SDCard support.") parser.add_target_argument("--with-spi-sdcard", action="store_true", help="Enable SPI-mode SDCard support.")
parser.add_target_argument("--without-dfu-rst", action="store_true", help="Disable DFU Reset when pressing Button for 1s.")
args = parser.parse_args() args = parser.parse_args()
soc = BaseSoC( soc = BaseSoC(
@ -212,6 +215,7 @@ def main():
device = args.device, device = args.device,
sdram_device = args.sdram_device, sdram_device = args.sdram_device,
sys_clk_freq = args.sys_clk_freq, sys_clk_freq = args.sys_clk_freq,
with_dfu_rst = not args.without_dfu_rst,
**parser.soc_argdict) **parser.soc_argdict)
if args.with_spi_sdcard: if args.with_spi_sdcard:
soc.add_spi_sdcard() soc.add_spi_sdcard()