projects
/
litex.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
500e58c
)
genlib/io: add optional external rst to CRG
author
Florent Kermarrec
<florent@enjoy-digital.fr>
Tue, 17 Mar 2015 15:22:22 +0000
(16:22 +0100)
committer
Florent Kermarrec
<florent@enjoy-digital.fr>
Tue, 17 Mar 2015 15:22:22 +0000
(16:22 +0100)
migen/genlib/io.py
patch
|
blob
|
history
diff --git
a/migen/genlib/io.py
b/migen/genlib/io.py
index 586dcf8c4e361ea11322ceef05d3908aa5b1e053..cd4360729230b0fe5390434ff22e28a8719a9ab4 100644
(file)
--- a/
migen/genlib/io.py
+++ b/
migen/genlib/io.py
@@
-35,7
+35,7
@@
class DifferentialOutput(Special):
raise NotImplementedError("Attempted to use a differential output, but platform does not support them")
class CRG(Module):
- def __init__(self, clk):
+ def __init__(self, clk
, rst=Signal()
):
self.clock_domains.cd_sys = ClockDomain()
self.clock_domains.cd_por = ClockDomain(reset_less=True)
@@
-46,7
+46,7
@@
class CRG(Module):
# Power on Reset (vendor agnostic)
rst_n = Signal()
- self.sync.por += rst_n.eq(1)
+ self.sync.por += rst_n.eq(1
& ~rst
)
self.comb += [
self.cd_sys.clk.eq(clk),
self.cd_por.clk.eq(clk),