From 2df3f9e6647bb08266c43f64ffca2d34496ca1fc Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Tue, 27 Jul 2021 14:55:19 +0200 Subject: [PATCH] pr243/platforms: Consistency with other platforms. --- litex_boards/platforms/digilent_cmod_a7.py | 26 +++++++------------- litex_boards/platforms/micronova_mercury2.py | 26 +++++++------------- litex_boards/targets/digilent_cmod_a7.py | 8 +++--- litex_boards/targets/micronova_mercury2.py | 3 +-- 4 files changed, 22 insertions(+), 41 deletions(-) diff --git a/litex_boards/platforms/digilent_cmod_a7.py b/litex_boards/platforms/digilent_cmod_a7.py index 5bfdcb05..2b7de21d 100644 --- a/litex_boards/platforms/digilent_cmod_a7.py +++ b/litex_boards/platforms/digilent_cmod_a7.py @@ -54,26 +54,18 @@ _io = [ ] # Connectors --------------------------------------------------------------------------------------- -_connectors = [ -] + +_connectors = [] # Platform ----------------------------------------------------------------------------------------- -class Xc7A35t_Platform(XilinxPlatform): - def __init__(self, io, conns ): - XilinxPlatform.__init__(self, "xc7a35t-cpg236-1", io, conns, toolchain="vivado") - def do_finalize(self,fragment): - self.add_period_constraint(self.lookup_request("clk12", loose=True), self.default_clk_period) - -def get_platform(base_platform): - class the_platform(base_platform): +class Platform(XilinxPlatform): + default_clk_name = "clk12" + default_clk_period = 1e9/12e6 def __init__(self): - self.default_clk_name = "clk12" - self.default_clk_period = 1e9/12e6 - base_platform.__init__(self,_io, _connectors) + XilinxPlatform.__init__(self, "xc7a35t-cpg236-1", _io, _connectors, toolchain="vivado") - def do_finalize(self, fragment): - base_platform.do_finalize(self, fragment) - - return the_platform() \ No newline at end of file + def do_finalize(self,fragment): + XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk12", loose=True), self.default_clk_period) diff --git a/litex_boards/platforms/micronova_mercury2.py b/litex_boards/platforms/micronova_mercury2.py index f35d2b0b..91a05faa 100644 --- a/litex_boards/platforms/micronova_mercury2.py +++ b/litex_boards/platforms/micronova_mercury2.py @@ -45,26 +45,18 @@ _io = [ ] # Connectors --------------------------------------------------------------------------------------- -_connectors = [ -] + +_connectors = [] # Platform ----------------------------------------------------------------------------------------- -class Xc7A35t_Platform(XilinxPlatform): - def __init__(self, io, conns ): - XilinxPlatform.__init__(self, "xc7a35tftg256-1", io, conns, toolchain="vivado") - def do_finalize(self,fragment): - self.add_period_constraint(self.lookup_request("clk50", loose=True), self.default_clk_period) - -def get_platform(base_platform): - class the_platform(base_platform): +class Platform(XilinxPlatform): + default_clk_name = "clk50" + default_clk_period = 1e9/50e6 def __init__(self): - self.default_clk_name = "clk50" - self.default_clk_period = 1e9/50e6 - base_platform.__init__(self,_io, _connectors) + XilinxPlatform.__init__(self, "xc7a35tftg256-1", _io, _connectors, toolchain="vivado") - def do_finalize(self, fragment): - base_platform.do_finalize(self, fragment) - - return the_platform() \ No newline at end of file + def do_finalize(self,fragment): + XilinxPlatform.do_finalize(self, fragment) + self.add_period_constraint(self.lookup_request("clk50", loose=True), self.default_clk_period) diff --git a/litex_boards/targets/digilent_cmod_a7.py b/litex_boards/targets/digilent_cmod_a7.py index 3d5105a7..15ed684a 100755 --- a/litex_boards/targets/digilent_cmod_a7.py +++ b/litex_boards/targets/digilent_cmod_a7.py @@ -113,17 +113,15 @@ def addAsyncSram(soc, platform, name, origin, size): # BaseSoC ------------------------------------------------------------------------------------------ class BaseSoC(SoCCore): - def __init__(self, - variant="a7-35", - toolchain="vivado", + def __init__(self, variant="a7-35", + toolchain="vivado", sys_clk_freq=int(100e6), ident_version=True, with_jtagbone=True, with_mapped_flash=False, **kwargs): - xc7a35t_base = digilent_cmod_a7.Xc7A35t_Platform - platform = digilent_cmod_a7.get_platform(xc7a35t_base) + platform = digilent_cmod_a7.Platform() # SoCCore ---------------------------------------------------------------------------------- SoCCore.__init__(self, platform, sys_clk_freq, diff --git a/litex_boards/targets/micronova_mercury2.py b/litex_boards/targets/micronova_mercury2.py index 2106ccc1..606ee7ad 100755 --- a/litex_boards/targets/micronova_mercury2.py +++ b/litex_boards/targets/micronova_mercury2.py @@ -119,8 +119,7 @@ class BaseSoC(SoCCore): enable_leds = True, **kwargs): - xc7a35t_base = micronova_mercury2.Xc7A35t_Platform - platform = micronova_mercury2.get_platform(xc7a35t_base) + platform = micronova_mercury2.Platform() # SoCCore ---------------------------------------------------------------------------------- SoCCore.__init__(self, platform, sys_clk_freq,