From 1f88a9d5ec053729ee21fbdbd821ae1f8a4eeebf Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Tue, 5 May 2020 11:45:41 +0200 Subject: [PATCH] platforms: make sure clocks inputs are constraints on all platforms. Also use new loose lookup_request to simplify constraints. --- litex_boards/platforms/ac701.py | 15 +++------------ litex_boards/platforms/aller.py | 4 ++++ litex_boards/platforms/arty.py | 4 ++++ litex_boards/platforms/arty_s7.py | 4 ++++ litex_boards/platforms/avalanche.py | 5 +++++ litex_boards/platforms/c10lprefkit.py | 5 +++++ litex_boards/platforms/camlink_4k.py | 4 ++++ litex_boards/platforms/colorlight_5a_75b.py | 4 ++++ litex_boards/platforms/de0nano.py | 4 ++++ litex_boards/platforms/de10lite.py | 6 ++++++ litex_boards/platforms/de10nano.py | 6 ++++++ litex_boards/platforms/de1soc.py | 4 ++++ litex_boards/platforms/de2_115.py | 4 ++++ litex_boards/platforms/ecp5_evn.py | 5 +++++ litex_boards/platforms/ecpix5.py | 4 ++++ litex_boards/platforms/fomu_evt.py | 4 ++++ litex_boards/platforms/fomu_hacker.py | 4 ++++ litex_boards/platforms/fomu_pvt.py | 4 ++++ litex_boards/platforms/genesys2.py | 6 ++---- litex_boards/platforms/hadbadge.py | 1 + litex_boards/platforms/icebreaker.py | 4 ++++ litex_boards/platforms/kc705.py | 15 +++------------ litex_boards/platforms/kcu105.py | 2 ++ litex_boards/platforms/kx2.py | 4 ++++ litex_boards/platforms/linsn_rv901t.py | 6 ++++++ litex_boards/platforms/machxo3.py | 4 ++++ litex_boards/platforms/mercury_xu5.py | 4 ++++ litex_boards/platforms/mimas_a7.py | 5 +++++ litex_boards/platforms/minispartan6.py | 5 +++++ litex_boards/platforms/nereid.py | 5 +++++ litex_boards/platforms/netv2.py | 5 +++++ litex_boards/platforms/nexys4ddr.py | 5 +++++ litex_boards/platforms/nexys_video.py | 5 +++++ litex_boards/platforms/orangecrab.py | 4 ++++ litex_boards/platforms/pipistrello.py | 4 ++++ litex_boards/platforms/sp605.py | 4 ++++ litex_boards/platforms/tagus.py | 4 ++++ litex_boards/platforms/tinyfpga_bx.py | 4 ++++ litex_boards/platforms/trellisboard.py | 8 ++++---- litex_boards/platforms/ulx3s.py | 4 ++++ litex_boards/platforms/vc707.py | 10 ++-------- litex_boards/platforms/vcu118.py | 9 +++++++-- litex_boards/platforms/versa_ecp5.py | 11 +++-------- litex_boards/platforms/zcu104.py | 2 ++ litex_boards/targets/ecpix5.py | 2 +- litex_boards/targets/kx2.py | 2 +- 46 files changed, 182 insertions(+), 52 deletions(-) diff --git a/litex_boards/platforms/ac701.py b/litex_boards/platforms/ac701.py index edbacbc5..06dbc15c 100644 --- a/litex_boards/platforms/ac701.py +++ b/litex_boards/platforms/ac701.py @@ -227,15 +227,6 @@ class Platform(XilinxPlatform): def do_finalize(self, fragment): XilinxPlatform.do_finalize(self, fragment) - try: - self.add_period_constraint(self.lookup_request("clk200").p, 1e9/200e6) - except ConstraintError: - pass - try: - self.add_period_constraint(self.lookup_request("eth_clocks").rx, 1e9/125e6) - except ConstraintError: - pass - try: - self.add_period_constraint(self.lookup_request("eth_clocks").tx, 1e9/125e6) - except ConstraintError: - pass + self.add_period_constraint(self.lookup_request("clk200", loose=True), 1e9/200e6) + self.add_period_constraint(self.lookup_request("eth_clocks:rx", loose=True), 1e9/125e6) + self.add_period_constraint(self.lookup_request("eth_clocks:tx", loose=True), 1e9/125e6) diff --git a/litex_boards/platforms/aller.py b/litex_boards/platforms/aller.py index 33890035..94abc2bc 100644 --- a/litex_boards/platforms/aller.py +++ b/litex_boards/platforms/aller.py @@ -120,3 +120,7 @@ class Platform(XilinxPlatform): def create_programmer(self): return OpenOCD("openocd_xilinx_xc7.cfg", "bscan_spi_xc7a200t.bit") + + def do_finalize(self, fragment): + XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk100", loose=True), 1e9/100e6) diff --git a/litex_boards/platforms/arty.py b/litex_boards/platforms/arty.py index 3294bf3b..712cd9ab 100644 --- a/litex_boards/platforms/arty.py +++ b/litex_boards/platforms/arty.py @@ -260,3 +260,7 @@ class Platform(XilinxPlatform): def create_programmer(self): bscan_spi = "bscan_spi_xc7a100t.bit" if "xc7a100t" in self.device else "bscan_spi_xc7a35t.bit" return OpenOCD("openocd_xilinx_xc7.cfg", bscan_spi) + + def do_finalize(self, fragment): + XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk100", loose=True), 1e9/100e6) diff --git a/litex_boards/platforms/arty_s7.py b/litex_boards/platforms/arty_s7.py index aaa399ac..952ffb08 100644 --- a/litex_boards/platforms/arty_s7.py +++ b/litex_boards/platforms/arty_s7.py @@ -213,3 +213,7 @@ class Platform(XilinxPlatform): def create_programmer(self): bscan_spi = "bscan_spi_xc7s50.bit" if "xc7s50" in self.device else "bscan_spi_xc7a25.bit" return OpenOCD("openocd_xilinx.cfg", bscan_spi) + + def do_finalize(self, fragment): + XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk100", loose=True), 1e9/100e6) diff --git a/litex_boards/platforms/avalanche.py b/litex_boards/platforms/avalanche.py index 5de18cde..ac5f568b 100644 --- a/litex_boards/platforms/avalanche.py +++ b/litex_boards/platforms/avalanche.py @@ -92,3 +92,8 @@ class Platform(MicrosemiPlatform): def __init__(self): MicrosemiPlatform.__init__(self, "MPF300TS_ES-FCG484-1", _io) + + def do_finalize(self, fragment): + MicrosemiPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk50", 0, loose=True), 1e9/50e6) + self.add_period_constraint(self.lookup_request("clk50", 1, loose=True), 1e9/50e6) diff --git a/litex_boards/platforms/c10lprefkit.py b/litex_boards/platforms/c10lprefkit.py index c26c1c84..eb1209ae 100644 --- a/litex_boards/platforms/c10lprefkit.py +++ b/litex_boards/platforms/c10lprefkit.py @@ -122,3 +122,8 @@ class Platform(AlteraPlatform): def create_programmer(self): return USBBlaster() + + def do_finalize(self, fragment): + AlteraPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk12", loose=True), 1e9/12e6) + self.add_period_constraint(self.lookup_request("clk25", loose=True), 1e9/25e6) diff --git a/litex_boards/platforms/camlink_4k.py b/litex_boards/platforms/camlink_4k.py index 05f74374..cc9985f3 100644 --- a/litex_boards/platforms/camlink_4k.py +++ b/litex_boards/platforms/camlink_4k.py @@ -60,3 +60,7 @@ class Platform(LatticePlatform): def __init__(self, **kwargs): LatticePlatform.__init__(self, "LFE5U-25F-8BG381C", _io, **kwargs) + + def do_finalize(self, fragment): + LatticePlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk27", loose=True), 1e9/27e6) diff --git a/litex_boards/platforms/colorlight_5a_75b.py b/litex_boards/platforms/colorlight_5a_75b.py index 27afe036..c808f0c2 100644 --- a/litex_boards/platforms/colorlight_5a_75b.py +++ b/litex_boards/platforms/colorlight_5a_75b.py @@ -220,3 +220,7 @@ class Platform(LatticePlatform): io = {"6.1": _io_v6_1, "7.0": _io_v7_0}[revision] connectors = {"6.1": _connectors_v6_1, "7.0": _connectors_v7_0}[revision] LatticePlatform.__init__(self, device, io, connectors=connectors, toolchain="trellis") + + def do_finalize(self, fragment): + LatticePlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk25", loose=True), 1e9/25e6) diff --git a/litex_boards/platforms/de0nano.py b/litex_boards/platforms/de0nano.py index 042a543e..819a47eb 100644 --- a/litex_boards/platforms/de0nano.py +++ b/litex_boards/platforms/de0nano.py @@ -114,3 +114,7 @@ class Platform(AlteraPlatform): def create_programmer(self): return USBBlaster() + + def do_finalize(self, fragment): + AlteraPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk50", loose=True), 1e9/50e6) diff --git a/litex_boards/platforms/de10lite.py b/litex_boards/platforms/de10lite.py index 0904a844..52cad0af 100644 --- a/litex_boards/platforms/de10lite.py +++ b/litex_boards/platforms/de10lite.py @@ -119,3 +119,9 @@ class Platform(AlteraPlatform): def create_programmer(self): return USBBlaster() + + def do_finalize(self, fragment): + AlteraPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk10", loose=True), 1e9/10e6) + self.add_period_constraint(self.lookup_request("clk50", 0, loose=True), 1e9/50e6) + self.add_period_constraint(self.lookup_request("clk50", 1, loose=True), 1e9/50e6) diff --git a/litex_boards/platforms/de10nano.py b/litex_boards/platforms/de10nano.py index 9f7f7e6d..75ac2733 100644 --- a/litex_boards/platforms/de10nano.py +++ b/litex_boards/platforms/de10nano.py @@ -129,3 +129,9 @@ class Platform(AlteraPlatform): def create_programmer(self): return USBBlaster() + + def do_finalize(self, fragment): + AlteraPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk50", 0, loose=True), 1e9/50e6) + self.add_period_constraint(self.lookup_request("clk50", 1, loose=True), 1e9/50e6) + self.add_period_constraint(self.lookup_request("clk50", 2, loose=True), 1e9/50e6) diff --git a/litex_boards/platforms/de1soc.py b/litex_boards/platforms/de1soc.py index 3377ab96..b8750ed9 100644 --- a/litex_boards/platforms/de1soc.py +++ b/litex_boards/platforms/de1soc.py @@ -45,3 +45,7 @@ class Platform(AlteraPlatform): def create_programmer(self): return USBBlaster() + + def do_finalize(self, fragment): + AlteraPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk50", loose=True), 1e9/50e6) diff --git a/litex_boards/platforms/de2_115.py b/litex_boards/platforms/de2_115.py index d8cedba9..4dad063a 100644 --- a/litex_boards/platforms/de2_115.py +++ b/litex_boards/platforms/de2_115.py @@ -45,3 +45,7 @@ class Platform(AlteraPlatform): def create_programmer(self): return USBBlaster() + + def do_finalize(self, fragment): + AlteraPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk50", loose=True), 1e9/50e6) diff --git a/litex_boards/platforms/ecp5_evn.py b/litex_boards/platforms/ecp5_evn.py index 8d25719d..2d88f143 100644 --- a/litex_boards/platforms/ecp5_evn.py +++ b/litex_boards/platforms/ecp5_evn.py @@ -138,3 +138,8 @@ class Platform(LatticePlatform): def create_programmer(self): trellis = os.environ.get("TRELLIS", "/usr/share/trellis") return OpenOCDJTAGProgrammer(os.path.join(trellis, "misc", "openocd", "ecp5-evn.cfg"), "bscan_spi_lfe5um5g85f.svf") + + def do_finalize(self, fragment): + LatticePlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk12", loose=True), 1e9/12e6) + self.add_period_constraint(self.lookup_request("clk200", loose=True), 1e9/200e6) diff --git a/litex_boards/platforms/ecpix5.py b/litex_boards/platforms/ecpix5.py index 07f0be68..b54f5fa4 100644 --- a/litex_boards/platforms/ecpix5.py +++ b/litex_boards/platforms/ecpix5.py @@ -96,3 +96,7 @@ class Platform(LatticePlatform): def __init__(self, **kwargs): LatticePlatform.__init__(self, "LFE5UM5G-85F-8BG554I", _io, _connectors, **kwargs) + + def do_finalize(self, fragment): + LatticePlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk100", loose=True), 1e9/100e6) diff --git a/litex_boards/platforms/fomu_evt.py b/litex_boards/platforms/fomu_evt.py index 1ab81e1e..9bede840 100644 --- a/litex_boards/platforms/fomu_evt.py +++ b/litex_boards/platforms/fomu_evt.py @@ -80,3 +80,7 @@ class Platform(LatticePlatform): def create_programmer(self): return IceStormProgrammer() + + def do_finalize(self, fragment): + LatticePlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk48", loose=True), 1e9/48e6) diff --git a/litex_boards/platforms/fomu_hacker.py b/litex_boards/platforms/fomu_hacker.py index 23e9c569..0e5cb2f8 100644 --- a/litex_boards/platforms/fomu_hacker.py +++ b/litex_boards/platforms/fomu_hacker.py @@ -64,3 +64,7 @@ class Platform(LatticePlatform): def create_programmer(self): return IceStormProgrammer() + + def do_finalize(self, fragment): + LatticePlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk48", loose=True), 1e9/48e6) diff --git a/litex_boards/platforms/fomu_pvt.py b/litex_boards/platforms/fomu_pvt.py index dbdeb5e6..fc1d2a9d 100644 --- a/litex_boards/platforms/fomu_pvt.py +++ b/litex_boards/platforms/fomu_pvt.py @@ -66,3 +66,7 @@ class Platform(LatticePlatform): def create_programmer(self): return IceStormProgrammer() + + def do_finalize(self, fragment): + LatticePlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk48", loose=True), 1e9/48e6) diff --git a/litex_boards/platforms/genesys2.py b/litex_boards/platforms/genesys2.py index 3b392932..7e5ebc43 100644 --- a/litex_boards/platforms/genesys2.py +++ b/litex_boards/platforms/genesys2.py @@ -121,7 +121,5 @@ class Platform(XilinxPlatform): def do_finalize(self, fragment): XilinxPlatform.do_finalize(self, fragment) - try: - self.add_period_constraint(self.lookup_request("eth_clocks").rx, 1e9/125e6) - except ConstraintError: - pass + self.add_period_constraint(self.lookup_request("clk200", loose=True), 1e9/200e6) + self.add_period_constraint(self.lookup_request("eth_clocks:rx", loose=True), 1e9/125e6) diff --git a/litex_boards/platforms/hadbadge.py b/litex_boards/platforms/hadbadge.py index dc66f82b..35bd086a 100644 --- a/litex_boards/platforms/hadbadge.py +++ b/litex_boards/platforms/hadbadge.py @@ -217,3 +217,4 @@ class Platform(LatticePlatform): def do_finalize(self, fragment): LatticePlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk8", loose=True), 1e9/8e6) diff --git a/litex_boards/platforms/icebreaker.py b/litex_boards/platforms/icebreaker.py index a46651ef..1525ba6b 100644 --- a/litex_boards/platforms/icebreaker.py +++ b/litex_boards/platforms/icebreaker.py @@ -86,3 +86,7 @@ class Platform(LatticePlatform): def create_programmer(self): return IceStormProgrammer() + + def do_finalize(self, fragment): + LatticePlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk12", loose=True), 1e9/12e6) diff --git a/litex_boards/platforms/kc705.py b/litex_boards/platforms/kc705.py index 3176528f..394e5867 100644 --- a/litex_boards/platforms/kc705.py +++ b/litex_boards/platforms/kc705.py @@ -553,16 +553,7 @@ set_property CONFIG_VOLTAGE 2.5 [current_design] def do_finalize(self, fragment): XilinxPlatform.do_finalize(self, fragment) - try: - self.add_period_constraint(self.lookup_request("clk200").p, 1e9/200e6) - except ConstraintError: - pass - try: - self.add_period_constraint(self.lookup_request("eth_clocks").rx, 1e9/125e6) - except ConstraintError: - pass - try: - self.add_period_constraint(self.lookup_request("eth_clocks").tx, 1e9/125e6) - except ConstraintError: - pass + self.add_period_constraint(self.lookup_request("clk200", loose=True), 1e9/200e6) + self.add_period_constraint(self.lookup_request("eth_clocks:rx", loose=True), 1e9/125e6) + self.add_period_constraint(self.lookup_request("eth_clocks:tx", loose=True), 1e9/125e6) self.add_platform_command("set_property DCI_CASCADE {{32 34}} [get_iobanks 33]") diff --git a/litex_boards/platforms/kcu105.py b/litex_boards/platforms/kcu105.py index 038df0fb..1230011d 100644 --- a/litex_boards/platforms/kcu105.py +++ b/litex_boards/platforms/kcu105.py @@ -498,6 +498,8 @@ class Platform(XilinxPlatform): def do_finalize(self, fragment): XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk125", loose=True), 1e9/125e6) + self.add_period_constraint(self.lookup_request("clk300", loose=True), 1e9/300e6) self.add_platform_command("set_property INTERNAL_VREF 0.84 [get_iobanks 44]") self.add_platform_command("set_property INTERNAL_VREF 0.84 [get_iobanks 45]") self.add_platform_command("set_property INTERNAL_VREF 0.84 [get_iobanks 46]") diff --git a/litex_boards/platforms/kx2.py b/litex_boards/platforms/kx2.py index 0fdde5e3..ae5c3859 100644 --- a/litex_boards/platforms/kx2.py +++ b/litex_boards/platforms/kx2.py @@ -74,3 +74,7 @@ class Platform(XilinxPlatform): def create_programmer(self): return OpenOCD("openocd_xilinx_xc7.cfg", "bscan_spi_xc7k160t.bit") + + def do_finalize(self, fragment): + XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk200", loose=True), 1e9/200e6) diff --git a/litex_boards/platforms/linsn_rv901t.py b/litex_boards/platforms/linsn_rv901t.py index bbab9ad7..78d5fb4c 100644 --- a/litex_boards/platforms/linsn_rv901t.py +++ b/litex_boards/platforms/linsn_rv901t.py @@ -294,3 +294,9 @@ class Platform(XilinxPlatform): def create_programmer(self): return OpenOCD("openocd_xilinx_xc6.cfg", "bscan_spi_xc6slx16.bit") + + def do_finalize(self, fragment): + XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk25", loose=True), 1e9/25e6) + self.add_period_constraint(self.lookup_request("eth_clocks:rx", 0, loose=True), 1e9/125e6) + self.add_period_constraint(self.lookup_request("eth_clocks:rx", 1, loose=True), 1e9/125e6) diff --git a/litex_boards/platforms/machxo3.py b/litex_boards/platforms/machxo3.py index ebf72d6a..d47242f4 100644 --- a/litex_boards/platforms/machxo3.py +++ b/litex_boards/platforms/machxo3.py @@ -92,3 +92,7 @@ class Platform(LatticePlatform): """ return LatticeProgrammer(_xcf_template) + + def do_finalize(self, fragment): + LatticePlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk12", loose=True), 1e9/12e6) diff --git a/litex_boards/platforms/mercury_xu5.py b/litex_boards/platforms/mercury_xu5.py index ac8dc17e..4c12f32c 100644 --- a/litex_boards/platforms/mercury_xu5.py +++ b/litex_boards/platforms/mercury_xu5.py @@ -92,6 +92,10 @@ class Platform(XilinxPlatform): def do_finalize(self, fragment): XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk100", loose=True), 1e9/100e6) + self.add_period_constraint(self.lookup_request("clk100_gtr", loose=True), 1e9/100e6) + self.add_period_constraint(self.lookup_request("clk27_gtr", loose=True), 1e9/27e6) + self.add_period_constraint(self.lookup_request("clk33", loose=True), 1e9/33e6) self.add_platform_command("set_property BITSTREAM.CONFIG.OVERTEMPSHUTDOWN ENABLE [current_design]") self.add_platform_command("set_property BITSTREAM.CONFIG.UNUSEDPIN PULLNONE [current_design]") self.add_platform_command("set_property INTERNAL_VREF 0.84 [get_iobanks 64]") diff --git a/litex_boards/platforms/mimas_a7.py b/litex_boards/platforms/mimas_a7.py index d6188d94..3a1b949d 100644 --- a/litex_boards/platforms/mimas_a7.py +++ b/litex_boards/platforms/mimas_a7.py @@ -184,3 +184,8 @@ class Platform(XilinxPlatform): def create_programmer(self): return OpenOCD("openocd_xilinx_xc7.cfg", "bscan_spi_xc7a50t.bit") + + def do_finalize(self, fragment): + XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk100", loose=True), 1e9/100e6) + self.add_period_constraint(self.lookup_request("eth_clocks", loose=True), 1e9/125e6) diff --git a/litex_boards/platforms/minispartan6.py b/litex_boards/platforms/minispartan6.py index 046ee16b..18d44337 100644 --- a/litex_boards/platforms/minispartan6.py +++ b/litex_boards/platforms/minispartan6.py @@ -137,3 +137,8 @@ class Platform(XilinxPlatform): def create_programmer(self): return FpgaProg() + + def do_finalize(self, fragment): + XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk32", loose=True), 1e9/32e6) + self.add_period_constraint(self.lookup_request("clk50", loose=True), 1e9/50e6) diff --git a/litex_boards/platforms/nereid.py b/litex_boards/platforms/nereid.py index 5d913a93..ef618a0e 100644 --- a/litex_boards/platforms/nereid.py +++ b/litex_boards/platforms/nereid.py @@ -404,3 +404,8 @@ set_property CONFIG_VOLTAGE 3.3 [current_design] def create_programmer(self): return OpenOCD("openocd_xilinx_xc7.cfg", "bscan_spi_xc7k160t.bit") + + def do_finalize(self, fragment): + XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk100", loose=True), 1e9/100e6) + self.add_period_constraint(self.lookup_request("clk150", loose=True), 1e9/150e6) diff --git a/litex_boards/platforms/netv2.py b/litex_boards/platforms/netv2.py index f70da0a1..0d6d9e27 100644 --- a/litex_boards/platforms/netv2.py +++ b/litex_boards/platforms/netv2.py @@ -194,3 +194,8 @@ class Platform(XilinxPlatform): def create_programmer(self): bscan_spi = "bscan_spi_xc7a100t.bit" if "xc7a100t" in self.device else "bscan_spi_xc7a35t.bit" return OpenOCD("openocd_netv2_rpi.cfg", bscan_spi) + + def do_finalize(self, fragment): + XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk50", loose=True), 1e9/50e6) + self.add_period_constraint(self.lookup_request("eth_clocks", loose=True), 1e9/50e6) diff --git a/litex_boards/platforms/nexys4ddr.py b/litex_boards/platforms/nexys4ddr.py index 85c29f55..e112ca62 100644 --- a/litex_boards/platforms/nexys4ddr.py +++ b/litex_boards/platforms/nexys4ddr.py @@ -133,3 +133,8 @@ class Platform(XilinxPlatform): def create_programmer(self): return OpenOCD("openocd_xilinx_xc7.cfg", "bscan_spi_xc7a100t.bit") + + def do_finalize(self, fragment): + XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk100", loose=True), 1e9/100e6) + self.add_period_constraint(self.lookup_request("eth_clocks:ref_clk", loose=True), 1e9/50e6) diff --git a/litex_boards/platforms/nexys_video.py b/litex_boards/platforms/nexys_video.py index 4c86a77a..e4a58ac8 100644 --- a/litex_boards/platforms/nexys_video.py +++ b/litex_boards/platforms/nexys_video.py @@ -240,3 +240,8 @@ class Platform(XilinxPlatform): self.add_period_constraint(self.lookup_request("eth_clocks").rx, 1e9/125e6) except ConstraintError: pass + + def do_finalize(self, fragment): + XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk100", loose=True), 1e9/100e6) + self.add_period_constraint(self.lookup_request("eth_clocks", loose=True), 1e9/125e6) diff --git a/litex_boards/platforms/orangecrab.py b/litex_boards/platforms/orangecrab.py index e6d2a7d3..96f6ee14 100644 --- a/litex_boards/platforms/orangecrab.py +++ b/litex_boards/platforms/orangecrab.py @@ -188,3 +188,7 @@ class Platform(LatticePlatform): io = {"0.1": _io_r0_1, "0.2": _io_r0_2 }[revision] connectors = {"0.1": _connectors_r0_1, "0.2": _connectors_r0_2}[revision] LatticePlatform.__init__(self, f"LFE5U-{device}-8MG285C", io, connectors, **kwargs) + + def do_finalize(self, fragment): + LatticePlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk48", loose=True), 1e9/48e6) diff --git a/litex_boards/platforms/pipistrello.py b/litex_boards/platforms/pipistrello.py index 296258b7..cbd7fd37 100644 --- a/litex_boards/platforms/pipistrello.py +++ b/litex_boards/platforms/pipistrello.py @@ -153,3 +153,7 @@ class Platform(XilinxPlatform): def create_programmer(self): return OpenOCD("openocd_xilinx_xc6.cfg", "bscan_spi_xc6slx45.bit") + + def do_finalize(self, fragment): + XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk50", loose=True), 1e9/50e6) diff --git a/litex_boards/platforms/sp605.py b/litex_boards/platforms/sp605.py index 624d8916..7fa7cbb4 100644 --- a/litex_boards/platforms/sp605.py +++ b/litex_boards/platforms/sp605.py @@ -168,3 +168,7 @@ class Platform(XilinxPlatform): def create_programmer(self): return OpenOCD("openocd_xilinx_xc6.cfg", "bscan_spi_xc6slx45.bit") + + def do_finalize(self, fragment): + XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk200", loose=True), 1e9/200e6) diff --git a/litex_boards/platforms/tagus.py b/litex_boards/platforms/tagus.py index a5fa4129..a1cef617 100644 --- a/litex_boards/platforms/tagus.py +++ b/litex_boards/platforms/tagus.py @@ -169,3 +169,7 @@ class Platform(XilinxPlatform): def create_programmer(self): return OpenOCD("openocd_xilinx_xc7.cfg", "bscan_spi_xc7a200t.bit") + + def do_finalize(self, fragment): + XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk100", loose=True), 1e9/100e6) diff --git a/litex_boards/platforms/tinyfpga_bx.py b/litex_boards/platforms/tinyfpga_bx.py index 4cfe9638..a1bfd5e5 100644 --- a/litex_boards/platforms/tinyfpga_bx.py +++ b/litex_boards/platforms/tinyfpga_bx.py @@ -67,3 +67,7 @@ class Platform(LatticePlatform): def create_programmer(self): return TinyProgProgrammer() + + def do_finalize(self, fragment): + LatticePlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk16", loose=True), 1e9/16e6) diff --git a/litex_boards/platforms/trellisboard.py b/litex_boards/platforms/trellisboard.py index 5d5655ff..1fd19826 100644 --- a/litex_boards/platforms/trellisboard.py +++ b/litex_boards/platforms/trellisboard.py @@ -221,7 +221,7 @@ class Platform(LatticePlatform): LatticePlatform.__init__(self, "LFE5UM5G-85F-8BG756C", _io, _connectors, **kwargs) def do_finalize(self, fragment): - try: - self.add_period_constraint(self.lookup_request("eth_clocks", 0).rx, 1e9/125e6) - except ConstraintError: - pass + LatticePlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk100", loose=True), 1e9/100e6) + self.add_period_constraint(self.lookup_request("clk12", loose=True), 1e9/12e6) + self.add_period_constraint(self.lookup_request("eth_clocks:rx", loose=True), 1e9/125e6) diff --git a/litex_boards/platforms/ulx3s.py b/litex_boards/platforms/ulx3s.py index 87feeb36..661051d9 100644 --- a/litex_boards/platforms/ulx3s.py +++ b/litex_boards/platforms/ulx3s.py @@ -101,3 +101,7 @@ class Platform(LatticePlatform): def __init__(self, device="LFE5U-45F", **kwargs): LatticePlatform.__init__(self, device + "-6BG381C", _io, **kwargs) + + def do_finalize(self, fragment): + LatticePlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk25", loose=True), 1e9/25e6) diff --git a/litex_boards/platforms/vc707.py b/litex_boards/platforms/vc707.py index 0e46a248..436e886a 100644 --- a/litex_boards/platforms/vc707.py +++ b/litex_boards/platforms/vc707.py @@ -648,11 +648,5 @@ class Platform(XilinxPlatform): def do_finalize(self, fragment): XilinxPlatform.do_finalize(self, fragment) - try: - self.add_period_constraint(self.lookup_request("clk200").p, 1e9/200e6) - except ConstraintError: - pass - try: - self.add_period_constraint(self.lookup_request("sgmii_clock").p, 1e9/125e6) - except ConstraintError: - pass + self.add_period_constraint(self.lookup_request("clk200", loose=True), 1e9/200e6) + self.add_period_constraint(self.lookup_request("sgmii_clock", loose=True), 1e9/125e6) diff --git a/litex_boards/platforms/vcu118.py b/litex_boards/platforms/vcu118.py index 8ac6e611..e9d5231f 100644 --- a/litex_boards/platforms/vcu118.py +++ b/litex_boards/platforms/vcu118.py @@ -12,11 +12,11 @@ _io = [ Subsignal("p", Pins("G31"), IOStandard("DIFF_SSTL12")), Subsignal("n", Pins("F31"), IOStandard("DIFF_SSTL12")), ), - ("clk250_1", 0, + ("clk250", 0, Subsignal("p", Pins("E12"), IOStandard("DIFF_SSTL12")), Subsignal("n", Pins("D12"), IOStandard("DIFF_SSTL12")), ), - ("clk250_2", 0, + ("clk250", 1, Subsignal("p", Pins("AW26"), IOStandard("DIFF_SSTL12")), Subsignal("n", Pins("AW27"), IOStandard("DIFF_SSTL12")), ), @@ -181,6 +181,11 @@ class Platform(XilinxPlatform): def do_finalize(self, fragment): XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk300", loose=True), 1e9/300e6) + self.add_period_constraint(self.lookup_request("clk250", 0, loose=True), 1e9/250e6) + self.add_period_constraint(self.lookup_request("clk250", 1, loose=True), 1e9/250e6) + self.add_period_constraint(self.lookup_request("clk125", loose=True), 1e9/125e6) + self.add_period_constraint(self.lookup_request("clk156", loose=True), 1e9/156e6) # DDR4 memory channel C1 Internal Vref self.add_platform_command("set_property INTERNAL_VREF 0.84 [get_iobanks 71]") self.add_platform_command("set_property INTERNAL_VREF 0.84 [get_iobanks 72]") diff --git a/litex_boards/platforms/versa_ecp5.py b/litex_boards/platforms/versa_ecp5.py index 03f0f1cf..8c6682c7 100644 --- a/litex_boards/platforms/versa_ecp5.py +++ b/litex_boards/platforms/versa_ecp5.py @@ -224,11 +224,6 @@ class Platform(LatticePlatform): LatticePlatform.__init__(self, "LFE5UM5G-45F-8BG381C", _io, _connectors, **kwargs) def do_finalize(self, fragment): - try: - self.add_period_constraint(self.lookup_request("eth_clocks", 0).rx, 1e9/125e6) - except ConstraintError: - pass - try: - self.add_period_constraint(self.lookup_request("eth_clocks", 1).rx, 1e9/125e6) - except ConstraintError: - pass + self.add_period_constraint(self.lookup_request("clk100", loose=True), 1e9/100e6) + self.add_period_constraint(self.lookup_request("eth_clocks:rx", 0, loose=True), 1e9/125e6) + self.add_period_constraint(self.lookup_request("eth_clocks:rx", 1, loose=True), 1e9/125e6) diff --git a/litex_boards/platforms/zcu104.py b/litex_boards/platforms/zcu104.py index 4ca0a52f..29cc6141 100644 --- a/litex_boards/platforms/zcu104.py +++ b/litex_boards/platforms/zcu104.py @@ -102,6 +102,8 @@ class Platform(XilinxPlatform): def do_finalize(self, fragment): XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk125", loose=True), 1e9/125e6) + self.add_period_constraint(self.lookup_request("clk300", loose=True), 1e9/125e6) self.add_platform_command("set_property INTERNAL_VREF 0.84 [get_iobanks 64]") self.add_platform_command("set_property INTERNAL_VREF 0.84 [get_iobanks 65]") self.add_platform_command("set_property INTERNAL_VREF 0.84 [get_iobanks 66]") diff --git a/litex_boards/targets/ecpix5.py b/litex_boards/targets/ecpix5.py index 1d4ed8b5..66cc2ed2 100755 --- a/litex_boards/targets/ecpix5.py +++ b/litex_boards/targets/ecpix5.py @@ -144,7 +144,7 @@ def main(): if args.load: load() - soc = BaseSoC(with_ethernet=with_ethernet, **soc_core_argdict(args)) + soc = BaseSoC(with_ethernet=args.with_ethernet, **soc_core_argdict(args)) builder = Builder(soc, **builder_argdict(args)) builder.build(**trellis_argdict(args)) diff --git a/litex_boards/targets/kx2.py b/litex_boards/targets/kx2.py index 3c3e101b..fabd2bca 100755 --- a/litex_boards/targets/kx2.py +++ b/litex_boards/targets/kx2.py @@ -7,7 +7,7 @@ import argparse from migen import * -from litex.boards.platforms import kx2 +from litex_boards.platforms import kx2 from litex.soc.cores.clock import * from litex.soc.integration.soc_core import *