From eb6fa45833f957d78d5156347e62a808d5e3646a Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Mon, 13 May 2019 10:59:26 +0200 Subject: [PATCH] cpu/vexriscv/core: update --- litex/soc/cores/cpu/vexriscv/core.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/litex/soc/cores/cpu/vexriscv/core.py b/litex/soc/cores/cpu/vexriscv/core.py index 3d904f868..c7931401d 100644 --- a/litex/soc/cores/cpu/vexriscv/core.py +++ b/litex/soc/cores/cpu/vexriscv/core.py @@ -16,6 +16,7 @@ CPU_VARIANTS = { "full": "VexRiscv_Full", "full+debug": "VexRiscv_FullDebug", "linux": "VexRiscv_Linux", + "linux+debug": "VexRiscv_LinuxDebug", } @@ -36,6 +37,7 @@ GCC_FLAGS = { "full": "-march=rv32im -mabi=ilp32", "full+debug": "-march=rv32im -mabi=ilp32", "linux": "-march=rv32ima -mabi=ilp32", + "linux+debug": "-march=rv32ima -mabi=ilp32", } @@ -104,6 +106,7 @@ class VexRiscv(Module, AutoCSR): i_externalResetVector=self.cpu_reset_address, i_externalInterruptArray=self.interrupt, i_timerInterrupt=0, + i_softwareInterrupt=0, o_iBusWishbone_ADR=ibus.adr, o_iBusWishbone_DAT_MOSI=ibus.dat_w, @@ -130,9 +133,6 @@ class VexRiscv(Module, AutoCSR): i_dBusWishbone_ERR=dbus.err) if "linux" in variant: - # Tie zero to prevent 1'bx here - self.cpu_params["i_softwareInterrupt"] = 0 - self.cpu_params["i_externalInterruptS"] = 0 self.add_timer() if "debug" in variant: