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

soc/init_ram: Define and use contents_size.

This commit is contained in:
Florent Kermarrec 2024-04-02 10:21:35 +02:00
parent ca04858b39
commit 06083c7863
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1069,11 +1069,12 @@ class SoC(LiteXModule, SoCCoreCompat):
True : "ROM", True : "ROM",
False : "RAM", False : "RAM",
}["w" not in ram_region.mode] }["w" not in ram_region.mode]
contents_size = 4*len(contents) # FIXME.
# Size Check. # Size Check.
if ram_region.size < 4*len(contents): if ram_region.size < contents_size:
self.logger.error("Contents Size ({}) {} {} Size ({}).".format( self.logger.error("Contents Size ({}) {} {} Size ({}).".format(
colorer(f"0x{4*len(contents):x}"), colorer(f"0x{contents_size:x}"),
colorer("exceeds", color="red"), colorer("exceeds", color="red"),
ram_type, ram_type,
colorer(f"0x{ram_region.size:x}"), colorer(f"0x{ram_region.size:x}"),
@ -1084,7 +1085,7 @@ class SoC(LiteXModule, SoCCoreCompat):
self.logger.info("Initializing {} {} with contents (Size: {}).".format( self.logger.info("Initializing {} {} with contents (Size: {}).".format(
ram_type, ram_type,
colorer(name), colorer(name),
colorer(f"0x{4*len(contents):x}"))) colorer(f"0x{contents_size:x}")))
ram.mem.init = contents ram.mem.init = contents
# RAM Auto-Resize (Optional). # RAM Auto-Resize (Optional).
@ -1093,7 +1094,7 @@ class SoC(LiteXModule, SoCCoreCompat):
ram_type, ram_type,
colorer(name), colorer(name),
colorer(f"0x{ram_region.size:x}"), colorer(f"0x{ram_region.size:x}"),
colorer(f"0x{4*len(contents):x}"))) colorer(f"0x{contents_size:x}")))
ram.mem.depth = len(contents) ram.mem.depth = len(contents)
def add_rom(self, name, origin, size, contents=[], mode="rx"): def add_rom(self, name, origin, size, contents=[], mode="rx"):