Merge pull request #1888 from Dolu1990/reset_vector

core/vexriscv_smp add reset vector support
This commit is contained in:
enjoy-digital 2024-02-13 11:43:40 +01:00 committed by GitHub
commit 89bf0fb0cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions

View File

@ -60,6 +60,7 @@ class VexRiscvSMP(CPU):
csr_base = 0xf000_0000 csr_base = 0xf000_0000
clint_base = 0xf001_0000 clint_base = 0xf001_0000
plic_base = 0xf0c0_0000 plic_base = 0xf0c0_0000
reset_vector = 0
# Command line configuration arguments. # Command line configuration arguments.
@staticmethod @staticmethod
@ -178,6 +179,7 @@ class VexRiscvSMP(CPU):
def generate_cluster_name(): def generate_cluster_name():
ldw = f"Ldw{VexRiscvSMP.litedram_width}" ldw = f"Ldw{VexRiscvSMP.litedram_width}"
VexRiscvSMP.cluster_name = f"VexRiscvLitexSmpCluster_" \ VexRiscvSMP.cluster_name = f"VexRiscvLitexSmpCluster_" \
f"{'R' + hex(VexRiscvSMP.reset_vector) if VexRiscvSMP.reset_vector else ''}"\
f"Cc{VexRiscvSMP.cpu_count}" \ f"Cc{VexRiscvSMP.cpu_count}" \
"_" \ "_" \
f"Iw{VexRiscvSMP.icache_width}" \ f"Iw{VexRiscvSMP.icache_width}" \
@ -276,6 +278,7 @@ class VexRiscvSMP(CPU):
if(VexRiscvSMP.coherent_dma): if(VexRiscvSMP.coherent_dma):
gen_args.append("--coherent-dma") gen_args.append("--coherent-dma")
gen_args.append(f"--cpu-count={VexRiscvSMP.cpu_count}") gen_args.append(f"--cpu-count={VexRiscvSMP.cpu_count}")
gen_args.append(f"--reset-vector={VexRiscvSMP.reset_vector}")
gen_args.append(f"--ibus-width={VexRiscvSMP.icache_width}") gen_args.append(f"--ibus-width={VexRiscvSMP.icache_width}")
gen_args.append(f"--dbus-width={VexRiscvSMP.dcache_width}") gen_args.append(f"--dbus-width={VexRiscvSMP.dcache_width}")
gen_args.append(f"--dcache-size={VexRiscvSMP.dcache_size}") gen_args.append(f"--dcache-size={VexRiscvSMP.dcache_size}")
@ -394,7 +397,7 @@ class VexRiscvSMP(CPU):
def set_reset_address(self, reset_address): def set_reset_address(self, reset_address):
self.reset_address = reset_address self.reset_address = reset_address
assert reset_address == 0x0000_0000 VexRiscvSMP.reset_vector = reset_address
def add_sources(self, platform): def add_sources(self, platform):
vdir = get_data_mod("cpu", "vexriscv_smp").data_location vdir = get_data_mod("cpu", "vexriscv_smp").data_location