From: Luke Kenneth Casson Leighton Date: Sat, 20 Feb 2021 20:47:48 +0000 (+0000) Subject: add black-box attribute to 4k SRAM cell X-Git-Tag: convert-csv-opcode-to-binary~196 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=83093afd5f9e4be2d9eba648dbdbedc661c88be0;p=soc.git add black-box attribute to 4k SRAM cell --- diff --git a/src/soc/bus/SPBlock512W64B8W.py b/src/soc/bus/SPBlock512W64B8W.py index d86b2375..bb15de29 100644 --- a/src/soc/bus/SPBlock512W64B8W.py +++ b/src/soc/bus/SPBlock512W64B8W.py @@ -41,13 +41,22 @@ class SPBlock512W64B8W(Elaboratable): q = Signal(64) # output d = Signal(64) # input + # create Chips4Makers 4k SRAM cell here, mark it as "black box" + # for coriolis2 to pick up sram = Instance("SPBlock_512W64B8W", i_a=a, o_q=q, i_d=d, i_we=we, i_clk=ClockSignal()) m.submodules += sram + sram.attrs['blackbox'] = 1 + # wishbone is active if cyc and stb set wb_active = Signal() m.d.comb += wb_active.eq(self.bus.cyc & self.bus.stb) + + # generate ack (no "pipeline" mode here) + m.d.sync += self.bus.ack.eq(wb_active) + with m.If(wb_active): + # address m.d.comb += a.eq(self.bus.adr) @@ -59,11 +68,6 @@ class SPBlock512W64B8W(Elaboratable): with m.If(self.bus.we): m.d.comb += we.eq(self.bus.sel) - # generate ack (no "pipeline" mode here) - m.d.sync += self.bus.ack.eq(0) - with m.If(self.bus.cyc & self.bus.stb): - m.d.sync += self.bus.ack.eq(1) - return m