Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

soc: Propagate main bus address_width to the different interfaces dynamically created.

This commit is contained in:
Florent Kermarrec 2022-09-12 16:13:45 +02:00
parent 95bed6de5c
commit a7cc1af416
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
litex/soc/integration/soc.py
View File

@ -332,7 +332,10 @@ class SoCBusHandler(Module):
axi.AXILiteInterface : axi.AXILiteConverter, axi.AXILiteInterface : axi.AXILiteConverter,
axi.AXIInterface : axi.AXIConverter, axi.AXIInterface : axi.AXIConverter,
}[interface_cls] }[interface_cls]
adapted_interface = interface_cls(data_width=self.data_width) adapted_interface = interface_cls(
data_width = self.data_width,
address_width = self.address_width
)
if direction == "m2s": if direction == "m2s":
master, slave = interface, adapted_interface master, slave = interface, adapted_interface
elif direction == "s2m": elif direction == "s2m":
@ -353,7 +356,10 @@ class SoCBusHandler(Module):
return interface return interface
# Different Bus-Standard: Return adapted interface. # Different Bus-Standard: Return adapted interface.
else: else:
adapted_interface = main_bus_cls(data_width=self.data_width) adapted_interface = main_bus_cls(
data_width = self.data_width,
address_width = self.address_width
)
if direction == "m2s": if direction == "m2s":
master, slave = interface, adapted_interface master, slave = interface, adapted_interface
elif direction == "s2m": elif direction == "s2m":
@ -897,7 +903,11 @@ class SoC(Module):
"axi-lite": axi.AXILiteInterface, "axi-lite": axi.AXILiteInterface,
"axi" : axi.AXILiteInterface, # FIXME: Use AXI-Lite for now, create AXISRAM. "axi" : axi.AXILiteInterface, # FIXME: Use AXI-Lite for now, create AXISRAM.
}[self.bus.standard] }[self.bus.standard]
ram_bus = interface_cls(data_width=self.bus.data_width, bursting=self.bus.bursting) ram_bus = interface_cls(
data_width = self.bus.data_width,
address_width = self.bus.address_width,
bursting = self.bus.bursting
)
ram = ram_cls(size, bus=ram_bus, init=contents, read_only=("w" not in mode), name=name) ram = ram_cls(size, bus=ram_bus, init=contents, read_only=("w" not in mode), name=name)
self.bus.add_slave(name, ram.bus, SoCRegion(origin=origin, size=size, mode=mode)) self.bus.add_slave(name, ram.bus, SoCRegion(origin=origin, size=size, mode=mode))
self.check_if_exists(name) self.check_if_exists(name)