From 8878c0a84ab3a1e5de00db09a03dfd408444efe0 Mon Sep 17 00:00:00 2001 From: Gabriel Somlo Date: Tue, 29 Oct 2019 12:29:47 -0400 Subject: [PATCH] versa_ecp5, trellisboard: add trellis toolchain specific arguments Sync up with Litex commit #49372852d. --- litex_boards/official/targets/versa_ecp5.py | 5 ++++- litex_boards/partner/targets/trellisboard.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/litex_boards/official/targets/versa_ecp5.py b/litex_boards/official/targets/versa_ecp5.py index c108d32..c7d6541 100755 --- a/litex_boards/official/targets/versa_ecp5.py +++ b/litex_boards/official/targets/versa_ecp5.py @@ -11,6 +11,8 @@ from migen.genlib.resetsync import AsyncResetSynchronizer from litex_boards.platforms import versa_ecp5 +from litex.build.lattice.trellis import trellis_args, trellis_argdict + from litex.soc.cores.clock import * from litex.soc.integration.soc_sdram import * from litex.soc.integration.builder import * @@ -133,6 +135,7 @@ def main(): help='gateware toolchain to use, diamond (default) or trellis') builder_args(parser) soc_sdram_args(parser) + trellis_args(parser) parser.add_argument("--sys-clk-freq", default=75e6, help="system clock frequency (default=75MHz)") parser.add_argument("--with-ethernet", action="store_true", @@ -142,7 +145,7 @@ def main(): cls = EthernetSoC if args.with_ethernet else BaseSoC soc = cls(toolchain=args.toolchain, sys_clk_freq=int(float(args.sys_clk_freq)), **soc_sdram_argdict(args)) builder = Builder(soc, **builder_argdict(args)) - builder.build() + builder.build(**trellis_argdict(args)) if __name__ == "__main__": main() diff --git a/litex_boards/partner/targets/trellisboard.py b/litex_boards/partner/targets/trellisboard.py index 627b9ff..dbf1a86 100755 --- a/litex_boards/partner/targets/trellisboard.py +++ b/litex_boards/partner/targets/trellisboard.py @@ -10,6 +10,8 @@ from migen.genlib.resetsync import AsyncResetSynchronizer from litex_boards.platforms import trellisboard +from litex.build.lattice.trellis import trellis_args, trellis_argdict + from litex.soc.cores.clock import * from litex.soc.integration.soc_sdram import * from litex.soc.integration.builder import * @@ -135,6 +137,7 @@ def main(): help='gateware toolchain to use, diamond (default) or trellis') builder_args(parser) soc_sdram_args(parser) + trellis_args(parser) parser.add_argument("--sys-clk-freq", default=75e6, help="system clock frequency (default=75MHz)") parser.add_argument("--with-ethernet", action="store_true", @@ -144,7 +147,7 @@ def main(): cls = EthernetSoC if args.with_ethernet else BaseSoC soc = cls(toolchain=args.toolchain, sys_clk_freq=int(float(args.sys_clk_freq)), **soc_sdram_argdict(args)) builder = Builder(soc, **builder_argdict(args)) - builder.build() + builder.build(**trellis_argdict(args)) if __name__ == "__main__": main()