mmap: remove offset logic

remove offset logic, this is now handled centrally here: enjoy-digital/litex#2166 Signed-off-by: Fin Maaß <[email protected]>
VOGL-electronic · Jan 22, 2025 · 74e1825 · 74e1825
1 parent 82fbb79
commit 74e1825
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/litespi/core/mmap.py b/litespi/core/mmap.py
@@ -80,7 +80,6 @@ def __init__(self, flash, clock_domain="sys", endianness="big", with_csr=True, w
         self.sink   = sink   = stream.Endpoint(spi_phy2core_layout)
         self.bus    = bus    = wishbone.Interface()
         self.cs     = cs     = Signal()
-        self.offset = offset = Signal(len(bus.adr))
 
         # Burst Control.
         burst_cs      = Signal()
@@ -208,7 +207,7 @@ def __init__(self, flash, clock_domain="sys", endianness="big", with_csr=True, w
             source.valid.eq(1),
             source.width.eq(flash.addr_width),
             source.mask.eq(addr_oe_mask[flash.addr_width]),
-            source.data.eq(Cat(byte_count, bus.adr - offset)), # send address.
+            source.data.eq(Cat(byte_count, bus.adr)), # send address.
             source.len.eq(flash.addr_bits),
             NextValue(burst_cs, 1),
             NextValue(burst_adr, bus.adr),

diff --git a/test/test_spi_mmap.py b/test/test_spi_mmap.py
@@ -40,11 +40,10 @@ def test_spi_mmap_write_test(self):
         opcode = Codes.PP_1_1_1
         dut = LiteSPIMMAP(flash=self.DummyChip(Codes.READ_1_1_1, [], program_cmd=opcode), with_write=True)
 
-        def wb_gen(dut, addr, data, offset):
+        def wb_gen(dut, addr, data):
             dut.done = 0
 
-            yield dut.offset.eq(offset)
-            yield from dut.bus.write(addr + offset, data)
+            yield from dut.bus.write(addr, data)
 
             dut.done = 1
 
@@ -90,9 +89,8 @@ def phy_gen(dut, addr, data):
             yield
         addr = 0xcafe
         data = 0xdeadbeef
-        offset = 0x10000
 
-        run_simulation(dut, [wb_gen(dut, addr, data, offset), phy_gen(dut, addr, data)])
+        run_simulation(dut, [wb_gen(dut, addr, data), phy_gen(dut, addr, data)])
         self.assertEqual(dut.done, 1)
         self.assertEqual(dut.addr_ok, 1)
         self.assertEqual(dut.opcode_ok, 1)