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

targets/orangecrab.py: propagate command arguments 

The parsed args are stripped off by soc_core_argdict() (called from
soc_sdram_argdict() so we have to pass them explicitly (or pass the
original "args", but this mimics the rest of the code in the repo).

This fixes #72
This commit is contained in:
Tommy Thorn 2020-05-06 18:17:17 -07:00
parent d34c3baf15
commit 6335717eca
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
litex_boards/targets/orangecrab.py
View File

@ -85,10 +85,8 @@ class _CRG(Module):
# BaseSoC ------------------------------------------------------------------------------------------ # BaseSoC ------------------------------------------------------------------------------------------
class BaseSoC(SoCCore): class BaseSoC(SoCCore):
def __init__(self, sys_clk_freq=int(48e6), toolchain="trellis", **kwargs): def __init__(self, revision = "0.2", device = "25F", sdram_device = "MT41K64M16",
# Board Revision --------------------------------------------------------------------------- sys_clk_freq=int(48e6), toolchain="trellis", **kwargs):
revision = kwargs.get("revision", "0.2")
device = kwargs.get("device", "25F")
platform = orangecrab.Platform(revision=revision, device=device ,toolchain=toolchain) platform = orangecrab.Platform(revision=revision, device=device ,toolchain=toolchain)
# Serial ----------------------------------------------------------------------------------- # Serial -----------------------------------------------------------------------------------
@ -109,8 +107,7 @@ class BaseSoC(SoCCore):
'MT41K256M16': MT41K256M16, 'MT41K256M16': MT41K256M16,
# 'MT41K512M16': MT41K512M16 # 'MT41K512M16': MT41K512M16
} }
sdram_module = available_sdram_modules.get( sdram_module = available_sdram_modules.get(sdram_device)
kwargs.get("sdram_device", "MT41K64M16"))
self.submodules.ddrphy = ECP5DDRPHY( self.submodules.ddrphy = ECP5DDRPHY(
platform.request("ddram"), platform.request("ddram"),
@ -142,7 +139,12 @@ def main():
parser.add_argument("--sdram-device", default="MT41K64M16", help="ECP5 device (default=MT41K64M16)") parser.add_argument("--sdram-device", default="MT41K64M16", help="ECP5 device (default=MT41K64M16)")
args = parser.parse_args() args = parser.parse_args()
soc = BaseSoC(toolchain=args.toolchain, sys_clk_freq=int(float(args.sys_clk_freq)), **soc_sdram_argdict(args)) soc = BaseSoC(toolchain=args.toolchain,
revision=args.revision,
device=args.device,
sdram_device=args.sdram_device,
sys_clk_freq=int(float(args.sys_clk_freq)),
**soc_sdram_argdict(args))
builder = Builder(soc, **builder_argdict(args)) builder = Builder(soc, **builder_argdict(args))
builder_kargs = trellis_argdict(args) if args.toolchain == "trellis" else {} builder_kargs = trellis_argdict(args) if args.toolchain == "trellis" else {}
builder.build(**builder_kargs, run=args.build) builder.build(**builder_kargs, run=args.build)