From b2173bba9f4a550de530bef7e8227e744abfd7b1 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 15 Mar 2013 19:17:05 +0100 Subject: [PATCH] Use new ClockDomain API --- build.py | 2 +- milkymist/m1crg/__init__.py | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/build.py b/build.py index 37dd33763..a4e332fe8 100755 --- a/build.py +++ b/build.py @@ -60,7 +60,7 @@ NET "asfifo*/preset_empty*" TIG; "jtag_tap_spartan6.v", "lm32_itlb.v", "lm32_dtlb.v") plat.add_sources(os.path.join("verilog", "lm32"), "lm32_config.v") - plat.build_cmdline(soc, clock_domains=soc.crg.get_clock_domains()) + plat.build_cmdline(soc) if __name__ == "__main__": main() diff --git a/milkymist/m1crg/__init__.py b/milkymist/m1crg/__init__.py index 8218a5061..3791b3714 100644 --- a/milkymist/m1crg/__init__.py +++ b/milkymist/m1crg/__init__.py @@ -3,9 +3,8 @@ from fractions import Fraction from migen.fhdl.structure import * from migen.fhdl.specials import Instance from migen.fhdl.module import Module -from mibuild.crg import CRG -class M1CRG(Module, CRG): +class M1CRG(Module): def __init__(self, infreq, outfreq1x): self.clk50_pad = Signal() self.trigger_reset = Signal() @@ -13,13 +12,13 @@ class M1CRG(Module, CRG): self.eth_rx_clk_pad = Signal() self.eth_tx_clk_pad = Signal() - self.cd_sys = ClockDomain("sys") - self.cd_sys2x_270 = ClockDomain("sys2x_270") - self.cd_sys4x_wr = ClockDomain("sys4x_wr") - self.cd_sys4x_rd = ClockDomain("sys4x_rd") - self.cd_eth_rx = ClockDomain("eth_rx") - self.cd_eth_tx = ClockDomain("eth_tx") - self.cd_vga = ClockDomain("vga") + self.clock_domains.cd_sys = ClockDomain() + self.clock_domains.cd_sys2x_270 = ClockDomain() + self.clock_domains.cd_sys4x_wr = ClockDomain() + self.clock_domains.cd_sys4x_rd = ClockDomain() + self.clock_domains.cd_eth_rx = ClockDomain() + self.clock_domains.cd_eth_tx = ClockDomain() + self.clock_domains.cd_vga = ClockDomain() ratio = Fraction(outfreq1x)/Fraction(infreq) in_period = float(Fraction(1000000000)/Fraction(infreq))