Hardware/litex
1
0
Fork 0
mirror of https://github.com/enjoy-digital/litex.git synced 2025-01-04 09:52:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

cpu: rocket, cva6: Fix compilation with newer binutils

Browse source 
Resolves the error:

 cpu/rocket/irq.h:23: Error: unrecognized opcode `csrr a4,mstatus',
 extension `zicsr' required

Rocket and cva6 missed this in commit 0e2a1b54a4 as they are 64bit
CPUs, and that change only updated the 32bit CPUs.

Tested with litex_sim and riscv64-unknown-elf-ld 2.40-2+4+b1 (Debian
Bookworm).

Signed-off-by: Joel Stanley <joel@jms.id.au>
This commit is contained in:
Joel Stanley 2023-03-22 16:53:15 +10:30
parent cd933da3ac
commit 71b522e5db
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
litex/soc/cores/cpu/cva6/core.py
View file

@ -31,7 +31,7 @@ GCC_FLAGS = {
# ||||/--- Single-Precision Floating-Point
# |||||/-- Double-Precision Floating-Point
# imacfd
"standard": "-march=rv64imac -mabi=lp64 ",
"standard": "-march=rv64i2p0_mac -mabi=lp64 ",
"full": "-march=rv64gc -mabi=lp64 ",
}

32
litex/soc/cores/cpu/rocket/core.py
View file

@ -67,21 +67,21 @@ CPU_VARIANTS = {
# GCC Flags-----------------------------------------------------------------------------------------
GCC_FLAGS = {
"standard" : "-march=rv64imac -mabi=lp64 ",
"linux" : "-march=rv64imac -mabi=lp64 ",
"linux4" : "-march=rv64imac -mabi=lp64 ",
"linuxd" : "-march=rv64imac -mabi=lp64 ",
"linux2d" : "-march=rv64imac -mabi=lp64 ",
"linuxq" : "-march=rv64imac -mabi=lp64 ",
"linux2q" : "-march=rv64imac -mabi=lp64 ",
"full" : "-march=rv64imafdc -mabi=lp64 ",
"fulld" : "-march=rv64imafdc -mabi=lp64 ",
"full4d" : "-march=rv64imafdc -mabi=lp64 ",
"fullq" : "-march=rv64imafdc -mabi=lp64 ",
"full4q" : "-march=rv64imafdc -mabi=lp64 ",
"fullo" : "-march=rv64imafdc -mabi=lp64 ",
"full4o" : "-march=rv64imafdc -mabi=lp64 ",
"full8o" : "-march=rv64imafdc -mabi=lp64 ",
"standard" : "-march=rv64i2p0_mac -mabi=lp64 ",
"linux" : "-march=rv64i2p0_mac -mabi=lp64 ",
"linux4" : "-march=rv64i2p0_mac -mabi=lp64 ",
"linuxd" : "-march=rv64i2p0_mac -mabi=lp64 ",
"linux2d" : "-march=rv64i2p0_mac -mabi=lp64 ",
"linuxq" : "-march=rv64i2p0_mac -mabi=lp64 ",
"linux2q" : "-march=rv64i2p0_mac -mabi=lp64 ",
"full" : "-march=rv64i2p0_mafdc -mabi=lp64 ",
"fulld" : "-march=rv64i2p0_mafdc -mabi=lp64 ",
"full4d" : "-march=rv64i2p0_mafdc -mabi=lp64 ",
"fullq" : "-march=rv64i2p0_mafdc -mabi=lp64 ",
"full4q" : "-march=rv64i2p0_mafdc -mabi=lp64 ",
"fullo" : "-march=rv64i2p0_mafdc -mabi=lp64 ",
"full4o" : "-march=rv64i2p0_mafdc -mabi=lp64 ",
"full8o" : "-march=rv64i2p0_mafdc -mabi=lp64 ",
}
# CPU Params ----------------------------------------------------------------------------------
@ -146,7 +146,7 @@ class Rocket(CPU):
@property
def gcc_flags(self):
flags = "-mno-save-restore "
flags += f"-march={self.get_arch(self.variant)} -mabi=lp64 "
flags += GCC_FLAGS[self.variant]
flags += "-D__rocket__ "
flags += "-mcmodel=medany"
return flags