diff --git a/hw/system/spatz_cluster/cfg/flamingo.hjson b/hw/system/spatz_cluster/cfg/flamingo.hjson index 95f52d1a..49476d69 100644 --- a/hw/system/spatz_cluster/cfg/flamingo.hjson +++ b/hw/system/spatz_cluster/cfg/flamingo.hjson @@ -68,8 +68,10 @@ length: 2147483648 }, l2: { - address: 1367343104, // 0x5180_0000 - length: 8388608 // 0x5200_0000 + // 0x5180_0000 + address: 1367343104, + // 0x5200_0000 + length: 8388608 }, peripherals: { }, diff --git a/sw/snRuntime/link/common.ld.in b/sw/snRuntime/link/common.ld.in index c521f884..e4625a7e 100644 --- a/sw/snRuntime/link/common.ld.in +++ b/sw/snRuntime/link/common.ld.in @@ -7,6 +7,7 @@ ENTRY(_start) MEMORY { + /* DRAM (rwxa) : ORIGIN = @MEM_DRAM_ORIGIN@, LENGTH = @MEM_DRAM_SIZE@ */ DRAM (rwxa) : ORIGIN = @L2_ORIGIN@, LENGTH = @L2_SIZE@ } diff --git a/util/clustergen/cluster.py b/util/clustergen/cluster.py index 8cacb60b..b9c50026 100644 --- a/util/clustergen/cluster.py +++ b/util/clustergen/cluster.py @@ -289,7 +289,7 @@ def calc_cache_sizes(self): def parse_pma_cfg(self, pma_cfg): self.cfg["pmas"] = dict() - # print(pma_cfg.regions) + print(pma_cfg.regions) self.cfg["pmas"]["cached"] = list() for pma in pma_cfg.regions: if pma[0] == PMA.CACHED: @@ -392,6 +392,12 @@ def __init__(self, cfg): self.cfg["dram"]["length"], self.cfg["cluster"]["addr_width"], ) + pma_cfg.add_region_length( + PMA.CACHED, + self.cfg["l2"]["address"], + self.cfg["l2"]["length"], + self.cfg["cluster"]["addr_width"], + ) self.cfg["cluster"]["tie_ports"] = True # Store Snitch cluster config in separate variable self.cluster = SnitchCluster(cfg["cluster"], pma_cfg)