From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Thu, 16 Jan 2020 12:17:33 +0000 (+0100)
Subject: targets/arty/genesys2: fix EthernetSoC/EtherboneSoC selection
X-Git-Tag: 24jan2021_ls180~737
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f2a1673f4676e8d626f772b01fc9a9dac4613609;p=litex.git

targets/arty/genesys2: fix EthernetSoC/EtherboneSoC selection
---

diff --git a/litex/boards/targets/arty.py b/litex/boards/targets/arty.py
index 903ef594..4e463449 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 afa4b2bd..30478c01 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()