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

Merge pull request #830 from dayjaby/vexriscv_mem_map 

VexRiscv: More general mem_map
This commit is contained in:
enjoy-digital 2021-03-01 11:15:56 +01:00 committed by GitHub
parent 6e883b4513 ceb8a6502c
commit 415bf63594
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
litex/soc/cores/cpu/vexriscv/core.py
View File

@ -96,12 +96,13 @@ class VexRiscv(CPU, AutoCSR):
io_regions = {0x80000000: 0x80000000} # origin, length io_regions = {0x80000000: 0x80000000} # origin, length
@property @property
def mem_map_linux(self): def mem_map(self):
return { return {
"rom": 0x00000000, "rom": 0x00000000,
"sram": 0x10000000, "sram": 0x10000000,
"main_ram": 0x40000000, "main_ram": 0x40000000,
"csr": 0xf0000000, "csr": 0xf0000000,
"vexriscv_debug": 0xf00f0000,
} }
@property @property
@ -110,7 +111,7 @@ class VexRiscv(CPU, AutoCSR):
flags += " -D__vexriscv__" flags += " -D__vexriscv__"
return flags return flags
def __init__(self, platform, variant="standard"): def __init__(self, platform, variant="standard", timer_enabled=True):
self.platform = platform self.platform = platform
self.variant = variant self.variant = variant
self.human_name = CPU_VARIANTS.get(variant, "VexRiscv") self.human_name = CPU_VARIANTS.get(variant, "VexRiscv")
@ -157,9 +158,8 @@ class VexRiscv(CPU, AutoCSR):
i_dBusWishbone_ERR = dbus.err i_dBusWishbone_ERR = dbus.err
) )
if "linux" in variant: if timer_enabled:
self.add_timer() self.add_timer()
self.mem_map = self.mem_map_linux
if "debug" in variant: if "debug" in variant:
self.add_debug() self.add_debug()
@ -267,7 +267,7 @@ class VexRiscv(CPU, AutoCSR):
def add_soc_components(self, soc, soc_region_cls): def add_soc_components(self, soc, soc_region_cls):
if "debug" in self.variant: if "debug" in self.variant:
soc.bus.add_slave("vexriscv_debug", self.debug_bus, region=soc_region_cls(origin=0xf00f0000, size=0x100, cached=False)) soc.bus.add_slave("vexriscv_debug", self.debug_bus, region=soc_region_cls(origin=soc.mem_map.get("vexriscv_debug"), size=0x100, cached=False))
def use_external_variant(self, variant_filename): def use_external_variant(self, variant_filename):