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 #1984 from VOGL-electronic/json2renode_elf 

litex_json2renode.py: add option for elf bios file and correct vexriscv variants
This commit is contained in:
enjoy-digital 2024-06-13 09:00:25 +02:00 committed by GitHub
parent eb3aca2a46 53ae12ca65
commit 7306c3862e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
litex/tools/litex_json2renode.py
View File

@ -219,23 +219,29 @@ def get_cpu_count(csr):
vexriscv_common_kind = { vexriscv_common_kind = {
'name': 'VexRiscv', 'name': 'VexRiscv',
'variants': { 'variants': {
'linux': { 'minimal': {
'properties': ['cpuType: "rv32ima"', 'privilegeArchitecture: PrivilegeArchitecture.Priv1_10'], 'properties': ['cpuType: "rv32i_zicsr_zifencei"'],
}, },
'i': { 'lite': {
'properties': ['cpuType: "rv32i"'], 'properties': ['cpuType: "rv32im_zicsr_zifencei"'],
}, },
'im': { 'standard': {
'properties': ['cpuType: "rv32im"'], 'properties': ['cpuType: "rv32im_zicsr_zifencei"'],
},
'ima': {
'properties': ['cpuType: "rv32ima"'],
}, },
'imac': { 'imac': {
'properties': ['cpuType: "rv32imac"'], 'properties': ['cpuType: "rv32imac_zicsr_zifencei"'],
},
'full': {
'properties': ['cpuType: "rv32im_zicsr_zifencei"'],
},
'linux': {
'properties': ['cpuType: "rv32ima_zicsr_zifencei"'],
},
'secure': {
'properties': ['cpuType: "rv32ima_zicsr_zifencei"'],
}, },
'others': { 'others': {
'properties': ['cpuType: "rv32im"'], 'properties': ['cpuType: "rv32im_zicsr_zifencei"'],
} }
}, },
'supports_time_provider': True, 'supports_time_provider': True,
@ -900,6 +906,12 @@ sysbus LoadBinary @{} {}
for cpu_id in range(0, number_of_cores): for cpu_id in range(0, number_of_cores):
result += f"cpu{cpu_id} PC {hex(rom_base)}\n" result += f"cpu{cpu_id} PC {hex(rom_base)}\n"
if args.bios_elf:
# load LiteX BIOS to ROM base
result += """
sysbus LoadELF @{}
""".format(args.bios_elf)
if args.tftp_ip: if args.tftp_ip:
result += """ result += """
@ -1057,6 +1069,8 @@ def parse_args():
bios_group = parser.add_mutually_exclusive_group() bios_group = parser.add_mutually_exclusive_group()
bios_group.add_argument('--bios-binary', action='store', bios_group.add_argument('--bios-binary', action='store',
help='Path to the BIOS binary') help='Path to the BIOS binary')
bios_group.add_argument('--bios-elf', action='store',
help='Path to the BIOS ELF file')
bios_group.add_argument('--opensbi-binary', action='store', bios_group.add_argument('--opensbi-binary', action='store',
help='Path to the OpenSBI binary') help='Path to the OpenSBI binary')