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

targets/sim: add ram-init param to allow initializing ram from file (faster than tftp)

This commit is contained in:
Florent Kermarrec 2018-09-20 00:49:38 +02:00
parent 9893c2460a
commit 1dbf591e78
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
litex/boards/targets/sim.py
View File

@ -7,6 +7,7 @@ from migen.genlib.io import CRG
from litex.boards.platforms import sim from litex.boards.platforms import sim
from litex.soc.integration.soc_core import *
from litex.soc.integration.soc_sdram import * from litex.soc.integration.soc_sdram import *
from litex.soc.integration.builder import * from litex.soc.integration.builder import *
from litex.soc.cores import uart from litex.soc.cores import uart
@ -65,7 +66,6 @@ class SimSoC(SoCSDRAM):
SoCSDRAM.__init__(self, platform, SoCSDRAM.__init__(self, platform,
clk_freq=int(1e9/platform.default_clk_period), clk_freq=int(1e9/platform.default_clk_period),
integrated_rom_size=0x8000, integrated_rom_size=0x8000,
integrated_main_ram_size=0x8000 if not with_sdram else 0,
ident="LiteX Simulation", ident_version=True, ident="LiteX Simulation", ident_version=True,
with_uart=False, with_uart=False,
**kwargs) **kwargs)
@ -144,6 +144,8 @@ def main():
parser = argparse.ArgumentParser(description="Generic LiteX SoC Simulation") parser = argparse.ArgumentParser(description="Generic LiteX SoC Simulation")
builder_args(parser) builder_args(parser)
soc_sdram_args(parser) soc_sdram_args(parser)
parser.add_argument("--ram-init", default=None,
help="ram_init file")
parser.add_argument("--with-sdram", action="store_true", parser.add_argument("--with-sdram", action="store_true",
help="enable SDRAM support") help="enable SDRAM support")
parser.add_argument("--with-ethernet", action="store_true", parser.add_argument("--with-ethernet", action="store_true",
@ -156,6 +158,13 @@ def main():
sim_config = SimConfig(default_clk="sys_clk") sim_config = SimConfig(default_clk="sys_clk")
sim_config.add_module("serial2console", "serial") sim_config.add_module("serial2console", "serial")
integrated_main_ram_init = []
if not args.with_sdram:
if args.ram_init is not None:
integrated_main_ram_init = get_mem_data(args.ram_init)
integrated_main_ram_size = max(len(integrated_main_ram_init), 0x10000)
else:
integrated_main_ram_size = 0
if args.with_ethernet: if args.with_ethernet:
sim_config.add_module("ethernet", "eth", args={"interface": "tap0", "ip": "192.168.1.100"}) sim_config.add_module("ethernet", "eth", args={"interface": "tap0", "ip": "192.168.1.100"})
if args.with_etherbone: if args.with_etherbone:
@ -165,6 +174,8 @@ def main():
with_ethernet=args.with_ethernet, with_ethernet=args.with_ethernet,
with_etherbone=args.with_etherbone, with_etherbone=args.with_etherbone,
with_analyzer=args.with_analyzer, with_analyzer=args.with_analyzer,
integrated_main_ram_size=integrated_main_ram_size,
integrated_main_ram_init=integrated_main_ram_init,
**soc_sdram_argdict(args)) **soc_sdram_argdict(args))
builder = Builder(soc, **builder_argdict(args)) builder = Builder(soc, **builder_argdict(args))
builder.build(sim_config=sim_config) builder.build(sim_config=sim_config)

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

@ -29,7 +29,7 @@ def mem_decoder(address, start=26, end=29):
return lambda a: a[start:end] == ((address >> (start+2)) & (2**(end-start))-1) return lambda a: a[start:end] == ((address >> (start+2)) & (2**(end-start))-1)
def get_mem_data(filename, mem_size): def get_mem_data(filename, mem_size=None):
data = [] data = []
with open(filename, "rb") as mem_file: with open(filename, "rb") as mem_file:
while True: while True:
@ -39,9 +39,10 @@ def get_mem_data(filename, mem_size):
data.append(struct.unpack(">I", w)[0]) data.append(struct.unpack(">I", w)[0])
data_size = len(data)*4 data_size = len(data)*4
assert data_size > 0 assert data_size > 0
assert data_size < mem_size, ( if mem_size is not None:
"file is too big: {}/{} bytes".format( assert data_size < mem_size, (
data_size, mem_size)) "file is too big: {}/{} bytes".format(
data_size, mem_size))
return data return data