From 19ef19ce0dda86219da013bd378b523a31a6020a Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Fri, 24 Jan 2020 09:06:35 +0100 Subject: [PATCH] cores/clock/create_clkout: rename clk_ce to ce, improve error reporting --- litex/soc/cores/clock.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/litex/soc/cores/clock.py b/litex/soc/cores/clock.py index 5e62f5de7..9139288e5 100644 --- a/litex/soc/cores/clock.py +++ b/litex/soc/cores/clock.py @@ -41,7 +41,7 @@ class XilinxClocking(Module, AutoCSR): raise ValueError self.clkin_freq = freq - def create_clkout(self, cd, freq, phase=0, buf="bufg", margin=1e-2, with_reset=True, clk_ce=None): + def create_clkout(self, cd, freq, phase=0, buf="bufg", margin=1e-2, with_reset=True, ce=None): assert self.nclkouts < self.nclkouts_max clkout = Signal() self.clkouts[self.nclkouts] = (clkout, freq, phase, margin) @@ -57,12 +57,14 @@ class XilinxClocking(Module, AutoCSR): self.specials += Instance("BUFG", i_I=clkout, o_O=clkout_buf) elif buf == "bufr": self.specials += Instance("BUFR", i_I=clkout, o_O=clkout_buf) - elif buf == "bufgce" and clk_ce != None: - self.specials += Instance("BUFGCE", i_I=clkout, o_O=clkout_buf, i_CE=clk_ce) + elif buf == "bufgce": + if ce is None: + raise ValueError("BUFGCE requires user to provide a clock enable ce Signal") + self.specials += Instance("BUFGCE", i_I=clkout, o_O=clkout_buf, i_CE=ce) elif buf == "bufio": self.specials += Instance("BUFIO", i_I=clkout, o_O=clkout_buf) else: - raise ValueError + raise ValueError("Unsupported clock buffer: {}".format(buf)) def compute_config(self): config = {}