litex_acorn_baseboard_mini: Proper fix to allow simultaneous Ethernet and SATA.

Tested successfully with ./litex_acorn_baseboard_mini.py --with-etherbone --with-sata --build --load.

-> Able to ping 192.168.1.50
-> Able to initialize SATA:
litex> sata_init
Initialize SATA...
Model:    WDC WDS120G1G0A-00SS50
Capacity: 120GB
Successful.
This commit is contained in:
Florent Kermarrec 2024-04-04 10:52:56 +02:00
parent d24e69c112
commit bce119e0c3
1 changed files with 8 additions and 8 deletions

View File

@ -134,27 +134,28 @@ class BaseSoC(SoCCore):
# Ethernet QPLL Settings. # Ethernet QPLL Settings.
qpll_eth_settings = QPLLSettings( qpll_eth_settings = QPLLSettings(
refclksel = 0b001, refclksel = 0b111,
fbdiv = 4, fbdiv = 4,
fbdiv_45 = 4, fbdiv_45 = 4,
refclk_div = 1 refclk_div = 1,
) )
# SATA QPLL Settings. # SATA QPLL Settings.
qpll_sata_settings = QPLLSettings( qpll_sata_settings = QPLLSettings(
refclksel = 0b001, refclksel = 0b111,
fbdiv = 4, fbdiv = 5,
fbdiv_45 = 4, fbdiv_45 = 4,
refclk_div = 1 refclk_div = 1,
) )
# Shared QPLL. # Shared QPLL.
self.qpll = qpll = QPLL( self.qpll = qpll = QPLL(
gtrefclk0 = Open() if not with_eth else self.crg.cd_eth_ref.clk, gtgrefclk0 = Open() if not with_eth else self.crg.cd_eth_ref.clk,
qpllsettings0 = None if not with_eth else qpll_eth_settings, qpllsettings0 = None if not with_eth else qpll_eth_settings,
gtrefclk1 = Open() if not with_sata else self.crg.cd_sata_ref.clk, gtgrefclk1 = Open() if not with_sata else self.crg.cd_sata_ref.clk,
qpllsettings1 = None if not with_sata else qpll_sata_settings, qpllsettings1 = None if not with_sata else qpll_sata_settings,
) )
platform.add_platform_command("set_property SEVERITY {{Warning}} [get_drc_checks REQP-49]")
# Ethernet / Etherbone --------------------------------------------------------------------- # Ethernet / Etherbone ---------------------------------------------------------------------
if with_ethernet or with_etherbone: if with_ethernet or with_etherbone:
@ -175,7 +176,6 @@ class BaseSoC(SoCCore):
rx_polarity = 1, # Inverted on Acorn. rx_polarity = 1, # Inverted on Acorn.
tx_polarity = 0 # Inverted on Acorn and on baseboard. tx_polarity = 0 # Inverted on Acorn and on baseboard.
) )
platform.add_platform_command("set_property SEVERITY {{Warning}} [get_drc_checks REQP-49]")
if with_etherbone: if with_etherbone:
self.add_etherbone(phy=self.ethphy, ip_address=eth_ip, with_ethmac=with_ethernet) self.add_etherbone(phy=self.ethphy, ip_address=eth_ip, with_ethmac=with_ethernet)