bench: Update test targets (add_csr no longer required).
This commit is contained in:
parent
26c9f82c1b
commit
c2a779df46
|
@ -77,14 +77,12 @@ class BenchSoC(SoCCore):
|
||||||
|
|
||||||
# CRG --------------------------------------------------------------------------------------
|
# CRG --------------------------------------------------------------------------------------
|
||||||
self.submodules.crg = _CRG(platform, sys_clk_freq)
|
self.submodules.crg = _CRG(platform, sys_clk_freq)
|
||||||
self.add_csr("crg")
|
|
||||||
|
|
||||||
# DDR3 SDRAM -------------------------------------------------------------------------------
|
# DDR3 SDRAM -------------------------------------------------------------------------------
|
||||||
self.submodules.ddrphy = s7ddrphy.A7DDRPHY(platform.request("ddram"),
|
self.submodules.ddrphy = s7ddrphy.A7DDRPHY(platform.request("ddram"),
|
||||||
memtype = "DDR3",
|
memtype = "DDR3",
|
||||||
nphases = 4,
|
nphases = 4,
|
||||||
sys_clk_freq = sys_clk_freq)
|
sys_clk_freq = sys_clk_freq)
|
||||||
self.add_csr("ddrphy")
|
|
||||||
self.add_sdram("sdram",
|
self.add_sdram("sdram",
|
||||||
phy = self.ddrphy,
|
phy = self.ddrphy,
|
||||||
module = MT41K128M16(sys_clk_freq, "1:4"),
|
module = MT41K128M16(sys_clk_freq, "1:4"),
|
||||||
|
@ -100,7 +98,6 @@ class BenchSoC(SoCCore):
|
||||||
clock_pads = self.platform.request("eth_clocks"),
|
clock_pads = self.platform.request("eth_clocks"),
|
||||||
pads = self.platform.request("eth"),
|
pads = self.platform.request("eth"),
|
||||||
with_hw_init_reset = False)
|
with_hw_init_reset = False)
|
||||||
self.add_csr("ethphy")
|
|
||||||
self.add_etherbone(phy=self.ethphy)
|
self.add_etherbone(phy=self.ethphy)
|
||||||
|
|
||||||
# Analyzer ---------------------------------------------------------------------------------
|
# Analyzer ---------------------------------------------------------------------------------
|
||||||
|
@ -111,14 +108,12 @@ class BenchSoC(SoCCore):
|
||||||
depth = 256,
|
depth = 256,
|
||||||
clock_domain = "sys",
|
clock_domain = "sys",
|
||||||
csr_csv = "analyzer.csv")
|
csr_csv = "analyzer.csv")
|
||||||
self.add_csr("analyzer")
|
|
||||||
|
|
||||||
# Leds -------------------------------------------------------------------------------------
|
# Leds -------------------------------------------------------------------------------------
|
||||||
from litex.soc.cores.led import LedChaser
|
from litex.soc.cores.led import LedChaser
|
||||||
self.submodules.leds = LedChaser(
|
self.submodules.leds = LedChaser(
|
||||||
pads = platform.request_all("user_led"),
|
pads = platform.request_all("user_led"),
|
||||||
sys_clk_freq = sys_clk_freq)
|
sys_clk_freq = sys_clk_freq)
|
||||||
self.add_csr("leds")
|
|
||||||
|
|
||||||
# Main ---------------------------------------------------------------------------------------------
|
# Main ---------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -71,14 +71,12 @@ class BenchSoC(SoCCore):
|
||||||
|
|
||||||
# CRG --------------------------------------------------------------------------------------
|
# CRG --------------------------------------------------------------------------------------
|
||||||
self.submodules.crg = _CRG(platform, sys_clk_freq)
|
self.submodules.crg = _CRG(platform, sys_clk_freq)
|
||||||
self.add_csr("crg")
|
|
||||||
|
|
||||||
# DDR3 SDRAM -------------------------------------------------------------------------------
|
# DDR3 SDRAM -------------------------------------------------------------------------------
|
||||||
self.submodules.ddrphy = s7ddrphy.K7DDRPHY(platform.request("ddram"),
|
self.submodules.ddrphy = s7ddrphy.K7DDRPHY(platform.request("ddram"),
|
||||||
memtype = "DDR3",
|
memtype = "DDR3",
|
||||||
nphases = 4,
|
nphases = 4,
|
||||||
sys_clk_freq = sys_clk_freq)
|
sys_clk_freq = sys_clk_freq)
|
||||||
self.add_csr("ddrphy")
|
|
||||||
self.add_sdram("sdram",
|
self.add_sdram("sdram",
|
||||||
phy = self.ddrphy,
|
phy = self.ddrphy,
|
||||||
module = MT41J256M16(sys_clk_freq, "1:4"),
|
module = MT41J256M16(sys_clk_freq, "1:4"),
|
||||||
|
@ -94,7 +92,6 @@ class BenchSoC(SoCCore):
|
||||||
clock_pads = self.platform.request("eth_clocks"),
|
clock_pads = self.platform.request("eth_clocks"),
|
||||||
pads = self.platform.request("eth"),
|
pads = self.platform.request("eth"),
|
||||||
with_hw_init_reset = False)
|
with_hw_init_reset = False)
|
||||||
self.add_csr("ethphy")
|
|
||||||
self.add_etherbone(phy=self.ethphy)
|
self.add_etherbone(phy=self.ethphy)
|
||||||
|
|
||||||
# Analyzer ---------------------------------------------------------------------------------
|
# Analyzer ---------------------------------------------------------------------------------
|
||||||
|
@ -105,14 +102,12 @@ class BenchSoC(SoCCore):
|
||||||
depth = 512,
|
depth = 512,
|
||||||
clock_domain = "sys",
|
clock_domain = "sys",
|
||||||
csr_csv = "analyzer.csv")
|
csr_csv = "analyzer.csv")
|
||||||
self.add_csr("analyzer")
|
|
||||||
|
|
||||||
# Leds -------------------------------------------------------------------------------------
|
# Leds -------------------------------------------------------------------------------------
|
||||||
from litex.soc.cores.led import LedChaser
|
from litex.soc.cores.led import LedChaser
|
||||||
self.submodules.leds = LedChaser(
|
self.submodules.leds = LedChaser(
|
||||||
pads = platform.request_all("user_led"),
|
pads = platform.request_all("user_led"),
|
||||||
sys_clk_freq = sys_clk_freq)
|
sys_clk_freq = sys_clk_freq)
|
||||||
self.add_csr("leds")
|
|
||||||
|
|
||||||
# Main ---------------------------------------------------------------------------------------------
|
# Main ---------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -71,14 +71,12 @@ class BenchSoC(SoCCore):
|
||||||
|
|
||||||
# CRG --------------------------------------------------------------------------------------
|
# CRG --------------------------------------------------------------------------------------
|
||||||
self.submodules.crg = _CRG(platform, sys_clk_freq)
|
self.submodules.crg = _CRG(platform, sys_clk_freq)
|
||||||
self.add_csr("crg")
|
|
||||||
|
|
||||||
# DDR3 SDRAM -------------------------------------------------------------------------------
|
# DDR3 SDRAM -------------------------------------------------------------------------------
|
||||||
self.submodules.ddrphy = s7ddrphy.K7DDRPHY(platform.request("ddram"),
|
self.submodules.ddrphy = s7ddrphy.K7DDRPHY(platform.request("ddram"),
|
||||||
memtype = "DDR3",
|
memtype = "DDR3",
|
||||||
nphases = 4,
|
nphases = 4,
|
||||||
sys_clk_freq = sys_clk_freq)
|
sys_clk_freq = sys_clk_freq)
|
||||||
self.add_csr("ddrphy")
|
|
||||||
self.add_sdram("sdram",
|
self.add_sdram("sdram",
|
||||||
phy = self.ddrphy,
|
phy = self.ddrphy,
|
||||||
module = MT8JTF12864(sys_clk_freq, "1:4"),
|
module = MT8JTF12864(sys_clk_freq, "1:4"),
|
||||||
|
@ -94,7 +92,6 @@ class BenchSoC(SoCCore):
|
||||||
clock_pads = self.platform.request("eth_clocks"),
|
clock_pads = self.platform.request("eth_clocks"),
|
||||||
pads = self.platform.request("eth"),
|
pads = self.platform.request("eth"),
|
||||||
clk_freq = self.clk_freq)
|
clk_freq = self.clk_freq)
|
||||||
self.add_csr("ethphy")
|
|
||||||
self.add_etherbone(phy=self.ethphy)
|
self.add_etherbone(phy=self.ethphy)
|
||||||
|
|
||||||
# Analyzer ---------------------------------------------------------------------------------
|
# Analyzer ---------------------------------------------------------------------------------
|
||||||
|
@ -105,14 +102,12 @@ class BenchSoC(SoCCore):
|
||||||
depth = 256,
|
depth = 256,
|
||||||
clock_domain = "sys",
|
clock_domain = "sys",
|
||||||
csr_csv = "analyzer.csv")
|
csr_csv = "analyzer.csv")
|
||||||
self.add_csr("analyzer")
|
|
||||||
|
|
||||||
# Leds -------------------------------------------------------------------------------------
|
# Leds -------------------------------------------------------------------------------------
|
||||||
from litex.soc.cores.led import LedChaser
|
from litex.soc.cores.led import LedChaser
|
||||||
self.submodules.leds = LedChaser(
|
self.submodules.leds = LedChaser(
|
||||||
pads = platform.request_all("user_led"),
|
pads = platform.request_all("user_led"),
|
||||||
sys_clk_freq = sys_clk_freq)
|
sys_clk_freq = sys_clk_freq)
|
||||||
self.add_csr("leds")
|
|
||||||
|
|
||||||
# Main ---------------------------------------------------------------------------------------------
|
# Main ---------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -89,14 +89,12 @@ class BenchSoC(SoCCore):
|
||||||
|
|
||||||
# CRG --------------------------------------------------------------------------------------
|
# CRG --------------------------------------------------------------------------------------
|
||||||
self.submodules.crg = _CRG(platform, sys_clk_freq)
|
self.submodules.crg = _CRG(platform, sys_clk_freq)
|
||||||
self.add_csr("crg")
|
|
||||||
|
|
||||||
# DDR4 SDRAM -------------------------------------------------------------------------------
|
# DDR4 SDRAM -------------------------------------------------------------------------------
|
||||||
self.submodules.ddrphy = usddrphy.USDDRPHY(platform.request("ddram"),
|
self.submodules.ddrphy = usddrphy.USDDRPHY(platform.request("ddram"),
|
||||||
memtype = "DDR4",
|
memtype = "DDR4",
|
||||||
sys_clk_freq = sys_clk_freq,
|
sys_clk_freq = sys_clk_freq,
|
||||||
iodelay_clk_freq = 200e6)
|
iodelay_clk_freq = 200e6)
|
||||||
self.add_csr("ddrphy")
|
|
||||||
self.add_sdram("sdram",
|
self.add_sdram("sdram",
|
||||||
phy = self.ddrphy,
|
phy = self.ddrphy,
|
||||||
module = EDY4016A(sys_clk_freq, "1:4"),
|
module = EDY4016A(sys_clk_freq, "1:4"),
|
||||||
|
@ -112,7 +110,6 @@ class BenchSoC(SoCCore):
|
||||||
self.submodules.ethphy = KU_1000BASEX(self.crg.cd_eth.clk,
|
self.submodules.ethphy = KU_1000BASEX(self.crg.cd_eth.clk,
|
||||||
data_pads = self.platform.request("sfp", 0),
|
data_pads = self.platform.request("sfp", 0),
|
||||||
sys_clk_freq = self.clk_freq)
|
sys_clk_freq = self.clk_freq)
|
||||||
self.add_csr("ethphy")
|
|
||||||
self.comb += self.platform.request("sfp_tx_disable_n", 0).eq(1)
|
self.comb += self.platform.request("sfp_tx_disable_n", 0).eq(1)
|
||||||
self.platform.add_platform_command("set_property SEVERITY {{Warning}} [get_drc_checks REQP-1753]")
|
self.platform.add_platform_command("set_property SEVERITY {{Warning}} [get_drc_checks REQP-1753]")
|
||||||
self.add_etherbone(phy=self.ethphy)
|
self.add_etherbone(phy=self.ethphy)
|
||||||
|
@ -125,14 +122,12 @@ class BenchSoC(SoCCore):
|
||||||
depth = 256,
|
depth = 256,
|
||||||
clock_domain = "sys",
|
clock_domain = "sys",
|
||||||
csr_csv = "analyzer.csv")
|
csr_csv = "analyzer.csv")
|
||||||
self.add_csr("analyzer")
|
|
||||||
|
|
||||||
# Leds -------------------------------------------------------------------------------------
|
# Leds -------------------------------------------------------------------------------------
|
||||||
from litex.soc.cores.led import LedChaser
|
from litex.soc.cores.led import LedChaser
|
||||||
self.submodules.leds = LedChaser(
|
self.submodules.leds = LedChaser(
|
||||||
pads = platform.request_all("user_led"),
|
pads = platform.request_all("user_led"),
|
||||||
sys_clk_freq = sys_clk_freq)
|
sys_clk_freq = sys_clk_freq)
|
||||||
self.add_csr("leds")
|
|
||||||
|
|
||||||
# Main ---------------------------------------------------------------------------------------------
|
# Main ---------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -85,14 +85,12 @@ class BenchSoC(SoCCore):
|
||||||
|
|
||||||
# CRG --------------------------------------------------------------------------------------
|
# CRG --------------------------------------------------------------------------------------
|
||||||
self.submodules.crg = _CRG(platform, sys_clk_freq, channel)
|
self.submodules.crg = _CRG(platform, sys_clk_freq, channel)
|
||||||
self.add_csr("crg")
|
|
||||||
|
|
||||||
# DDR4 SDRAM -------------------------------------------------------------------------------
|
# DDR4 SDRAM -------------------------------------------------------------------------------
|
||||||
self.submodules.ddrphy = usddrphy.USPDDRPHY(platform.request("ddram", channel),
|
self.submodules.ddrphy = usddrphy.USPDDRPHY(platform.request("ddram", channel),
|
||||||
memtype = "DDR4",
|
memtype = "DDR4",
|
||||||
sys_clk_freq = sys_clk_freq,
|
sys_clk_freq = sys_clk_freq,
|
||||||
iodelay_clk_freq = 500e6)
|
iodelay_clk_freq = 500e6)
|
||||||
self.add_csr("ddrphy")
|
|
||||||
self.add_sdram("sdram",
|
self.add_sdram("sdram",
|
||||||
phy = self.ddrphy,
|
phy = self.ddrphy,
|
||||||
module = MT40A512M8(sys_clk_freq, "1:4"),
|
module = MT40A512M8(sys_clk_freq, "1:4"),
|
||||||
|
@ -114,14 +112,12 @@ class BenchSoC(SoCCore):
|
||||||
depth = 256,
|
depth = 256,
|
||||||
clock_domain = "sys",
|
clock_domain = "sys",
|
||||||
csr_csv = "analyzer.csv")
|
csr_csv = "analyzer.csv")
|
||||||
self.add_csr("analyzer")
|
|
||||||
|
|
||||||
# Leds -------------------------------------------------------------------------------------
|
# Leds -------------------------------------------------------------------------------------
|
||||||
from litex.soc.cores.led import LedChaser
|
from litex.soc.cores.led import LedChaser
|
||||||
self.submodules.leds = LedChaser(
|
self.submodules.leds = LedChaser(
|
||||||
pads = platform.request_all("user_led"),
|
pads = platform.request_all("user_led"),
|
||||||
sys_clk_freq = sys_clk_freq)
|
sys_clk_freq = sys_clk_freq)
|
||||||
self.add_csr("leds")
|
|
||||||
|
|
||||||
# Main ---------------------------------------------------------------------------------------------
|
# Main ---------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue