From 90c1d7b62d56dad46eadec3b1024af0c60a79302 Mon Sep 17 00:00:00 2001 From: Dolu1990 Date: Wed, 20 Mar 2024 17:56:53 +0100 Subject: [PATCH] Update the reset topology --- litex/soc/cores/cpu/vexiiriscv/core.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/litex/soc/cores/cpu/vexiiriscv/core.py b/litex/soc/cores/cpu/vexiiriscv/core.py index 113d238fc..948cf937d 100755 --- a/litex/soc/cores/cpu/vexiiriscv/core.py +++ b/litex/soc/cores/cpu/vexiiriscv/core.py @@ -184,8 +184,8 @@ class VexiiRiscv(CPU): # CPU Instance. self.cpu_params = dict( # Clk/Rst. - i_socClk = ClockSignal("sys"), - i_asyncReset = ResetSignal("sys") | self.reset, + i_system_clk = ClockSignal("sys"), + i_system_reset = ResetSignal("sys") | self.reset, # Patcher/Tracer. # o_patcher_tracer_valid = self.tracer_valid, @@ -417,17 +417,15 @@ class VexiiRiscv(CPU): # Debug resets. debug_ndmreset = Signal() debug_ndmreset_last = Signal() - debug_ndmreset_rise = Signal() self.cpu_params.update( - # i_debug_reset = debug_reset, FIXME + i_debugReset = debug_reset, o_debug_dm_ndmreset = debug_ndmreset, ) # Reset SoC's CRG when debug_ndmreset rising edge. - # self.sync.debug_por += debug_ndmreset_last.eq(debug_ndmreset) - # self.comb += debug_ndmreset_rise.eq(debug_ndmreset & ~debug_ndmreset_last) - # self.comb += If(debug_ndmreset_rise, soc.crg.rst.eq(1)) - # FIXME + self.sync.debug_por += debug_ndmreset_last.eq(debug_ndmreset) + self.comb += If(debug_ndmreset, soc.crg.cd_sys.rst.eq(1)) + self.soc_bus = soc.bus # FIXME: Save SoC Bus instance to retrieve the final mem layout on finalization.