targets/digilent_arty: Allow --with-ethernet and --with-etherbone and remove --with-hybrid.

This commit is contained in:
Florent Kermarrec 2024-02-26 15:56:58 +01:00
parent feae57e7fb
commit aa34acc426

View file

@ -75,7 +75,6 @@ class BaseSoC(SoCCore):
with_dna = False, with_dna = False,
with_ethernet = False, with_ethernet = False,
with_etherbone = False, with_etherbone = False,
with_hybrid = False,
eth_ip = "192.168.1.50", eth_ip = "192.168.1.50",
remote_ip = None, remote_ip = None,
eth_dynamic_ip = False, eth_dynamic_ip = False,
@ -116,14 +115,14 @@ class BaseSoC(SoCCore):
) )
# Ethernet / Etherbone --------------------------------------------------------------------- # Ethernet / Etherbone ---------------------------------------------------------------------
if with_ethernet or with_etherbone or with_hybrid: if with_ethernet or with_etherbone:
self.ethphy = LiteEthPHYMII( self.ethphy = LiteEthPHYMII(
clock_pads = self.platform.request("eth_clocks"), clock_pads = self.platform.request("eth_clocks"),
pads = self.platform.request("eth")) pads = self.platform.request("eth"))
if with_ethernet: if with_etherbone:
self.add_etherbone(phy=self.ethphy, ip_address=eth_ip, with_ethmac=with_ethernet)
elif with_ethernet:
self.add_ethernet(phy=self.ethphy, dynamic_ip=eth_dynamic_ip, local_ip=eth_ip, remote_ip=remote_ip) self.add_ethernet(phy=self.ethphy, dynamic_ip=eth_dynamic_ip, local_ip=eth_ip, remote_ip=remote_ip)
if with_etherbone or with_hybrid:
self.add_etherbone(phy=self.ethphy, ip_address=eth_ip, with_ethmac=True)
# SPI Flash -------------------------------------------------------------------------------- # SPI Flash --------------------------------------------------------------------------------
if with_spi_flash: if with_spi_flash:
@ -194,10 +193,8 @@ def main():
parser.add_target_argument("--with-xadc", action="store_true", help="Enable 7-Series XADC.") parser.add_target_argument("--with-xadc", action="store_true", help="Enable 7-Series XADC.")
parser.add_target_argument("--with-dna", action="store_true", help="Enable 7-Series DNA.") parser.add_target_argument("--with-dna", action="store_true", help="Enable 7-Series DNA.")
parser.add_target_argument("--with-usb", action="store_true", help="Enable USB Host.") parser.add_target_argument("--with-usb", action="store_true", help="Enable USB Host.")
ethopts = parser.target_group.add_mutually_exclusive_group() parser.add_target_argument("--with-ethernet", action="store_true", help="Enable Ethernet support.")
ethopts.add_argument("--with-ethernet", action="store_true", help="Enable Ethernet support.") parser.add_target_argument("--with-etherbone", action="store_true", help="Enable Etherbone support.")
ethopts.add_argument("--with-etherbone", action="store_true", help="Enable Etherbone support.")
ethopts.add_argument("--with-hybrid", action="store_true", help="Enable Etherbone+Ethernet support.")
parser.add_target_argument("--eth-ip", default="192.168.1.50", help="Ethernet/Etherbone IP address.") parser.add_target_argument("--eth-ip", default="192.168.1.50", help="Ethernet/Etherbone IP address.")
parser.add_target_argument("--remote-ip", default="192.168.1.100", help="Remote IP address of TFTP server.") parser.add_target_argument("--remote-ip", default="192.168.1.100", help="Remote IP address of TFTP server.")
parser.add_target_argument("--eth-dynamic-ip", action="store_true", help="Enable dynamic Ethernet IP addresses setting.") parser.add_target_argument("--eth-dynamic-ip", action="store_true", help="Enable dynamic Ethernet IP addresses setting.")
@ -219,7 +216,6 @@ def main():
with_dna = args.with_dna, with_dna = args.with_dna,
with_ethernet = args.with_ethernet, with_ethernet = args.with_ethernet,
with_etherbone = args.with_etherbone, with_etherbone = args.with_etherbone,
with_hybrid = args.with_hybrid,
eth_ip = args.eth_ip, eth_ip = args.eth_ip,
remote_ip = args.remote_ip, remote_ip = args.remote_ip,
eth_dynamic_ip = args.eth_dynamic_ip, eth_dynamic_ip = args.eth_dynamic_ip,