From f2a1673f4676e8d626f772b01fc9a9dac4613609 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Thu, 16 Jan 2020 13:17:33 +0100 Subject: [PATCH] targets/arty/genesys2: fix EthernetSoC/EtherboneSoC selection --- litex/boards/targets/arty.py | 7 +++++-- litex/boards/targets/genesys2.py | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/litex/boards/targets/arty.py b/litex/boards/targets/arty.py index 903ef5947..4e4634492 100755 --- a/litex/boards/targets/arty.py +++ b/litex/boards/targets/arty.py @@ -148,8 +148,11 @@ def main(): args = parser.parse_args() assert not (args.with_ethernet and args.with_etherbone) - cls = EthernetSoC if args.with_ethernet else BaseSoC - cls = EtherboneSoC if args.with_etherbone else BaseSoC + cls = BaseSoC + if args.with_ethernet: + cls = EthernetSoC + if args.with_etherbone: + cls = EtherboneSoC soc = cls(**soc_sdram_argdict(args)) builder = Builder(soc, **builder_argdict(args)) builder.build(**vivado_build_argdict(args)) diff --git a/litex/boards/targets/genesys2.py b/litex/boards/targets/genesys2.py index afa4b2bdc..30478c010 100755 --- a/litex/boards/targets/genesys2.py +++ b/litex/boards/targets/genesys2.py @@ -139,8 +139,11 @@ def main(): args = parser.parse_args() assert not (args.with_ethernet and args.with_etherbone) - cls = EthernetSoC if args.with_ethernet else BaseSoC - cls = EtherboneSoC if args.with_etherbone else BaseSoC + cls = BaseSoC + if args.with_ethernet: + cls = EthernetSoC + if args.with_etherbone: + cls = EtherboneSoC soc = cls(**soc_sdram_argdict(args)) builder = Builder(soc, **builder_argdict(args)) builder.build()