From 715d332c3d76b89053e15259accc4c4ae979e51b Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 8 Apr 2013 20:28:11 +0200 Subject: [PATCH] crg: apply constraint to IO pins, not internal signals --- mibuild/crg.py | 8 +++++--- mibuild/xilinx_ise.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mibuild/crg.py b/mibuild/crg.py index 7d967742a..83ae9c4e5 100644 --- a/mibuild/crg.py +++ b/mibuild/crg.py @@ -3,9 +3,11 @@ from migen.fhdl.module import Module class SimpleCRG(Module): def __init__(self, platform, clk_name, rst_name, rst_invert=False): + self._clk = platform.request(clk_name) + self._rst = platform.request(rst_name) self.clock_domains.cd_sys = ClockDomain() - self.comb += self.cd_sys.clk.eq(platform.request(clk_name)) + self.comb += self.cd_sys.clk.eq(self._clk) if rst_invert: - self.comb += self.cd_sys.rst.eq(~platform.request(rst_name)) + self.comb += self.cd_sys.rst.eq(~self._rst) else: - self.comb += self.cd_sys.rst.eq(platform.request(rst_name)) + self.comb += self.cd_sys.rst.eq(self._rst) diff --git a/mibuild/xilinx_ise.py b/mibuild/xilinx_ise.py index 6a1e9d7ed..a6c31c00c 100644 --- a/mibuild/xilinx_ise.py +++ b/mibuild/xilinx_ise.py @@ -17,7 +17,7 @@ TIMESPEC "TSclk" = PERIOD "GRPclk" """+str(period)+""" ns HIGH 50%;""", clk=clk) class CRG_SE(SimpleCRG): def __init__(self, platform, clk_name, rst_name, period, rst_invert=False): SimpleCRG.__init__(self, platform, clk_name, rst_name, rst_invert) - _add_period_constraint(platform, self.cd_sys.clk, period) + _add_period_constraint(platform, self._clk, period) class CRG_DS(Module): def __init__(self, platform, clk_name, rst_name, period, rst_invert=False):