From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Wed, 13 Mar 2019 09:42:10 +0000 (+0100)
Subject: utils/litex_sim: increase default integrated_main_ram_size to 256MB, automatically... 
X-Git-Tag: 24jan2021_ls180~1365
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=411bca790a6a263d994d724f8f366ce5d98e75cc;p=litex.git

utils/litex_sim: increase default integrated_main_ram_size to 256MB, automatically boot on main_ram when ram_init is specified
---

diff --git a/litex/utils/litex_sim.py b/litex/utils/litex_sim.py
index 4e6eb88d..868dbb19 100755
--- a/litex/utils/litex_sim.py
+++ b/litex/utils/litex_sim.py
@@ -218,11 +218,11 @@ def main():
     if args.rom_init:
         soc_kwargs["integrated_rom_init"] = get_mem_data(args.rom_init)
     if not args.with_sdram:
-        soc_kwargs["integrated_main_ram_size"] = 0x10000
+        soc_kwargs["integrated_main_ram_size"] = 0x1000000 # 256 MB
         if args.ram_init is not None:
             soc_kwargs["integrated_main_ram_init"] = get_mem_data(args.ram_init)
-            soc_kwargs["integrated_main_ram_size"] = max(len(soc_kwargs["integrated_main_ram_init"]), 0x10000)
     else:
+        assert args.ram_init is None
         soc_kwargs["integrated_main_ram_size"] = 0x0
     if args.with_ethernet:
         sim_config.add_module("ethernet", "eth", args={"interface": "tap0", "ip": "192.168.1.100"})
@@ -235,6 +235,8 @@ def main():
         with_etherbone=args.with_etherbone,
         with_analyzer=args.with_analyzer,
         **soc_kwargs)
+    if args.ram_init is not None:
+        soc.add_constant("ROM_BOOT_ADDRESS", 0x40000000)
     builder_kwargs["csr_csv"] = "csr.csv"
     builder = Builder(soc, **builder_kwargs)
     vns = builder.build(run=False, threads=args.threads, sim_config=sim_config, trace=args.trace)