diff --git a/litex/tools/litex_json2renode.py b/litex/tools/litex_json2renode.py
index 788c53057..259eea571 100755
--- a/litex/tools/litex_json2renode.py
+++ b/litex/tools/litex_json2renode.py
@@ -245,14 +245,33 @@ cpu: CPU.VexRiscv @ sysbus
         return """
 cpu: CPU.PicoRV32 @ sysbus
     cpuType: "rv32imc"
+"""
+    elif kind == 'minerva':
+        return """
+cpu: CPU.Minerva @ sysbus
 """
     elif kind == 'ibex':
         return """
-cpu: CPU.RiscV32 @ sysbus
-    cpuType: "rv32imc"
-    timeProvider: empty
-    interruptMode: InterruptMode.Vectored
+cpu: CPU.IbexRiscV32 @ sysbus
 """
+    elif kind == 'cv32e40p':
+        result = """
+cpu: CPU.CV32E40P @ sysbus
+"""
+        if variant == 'standard':
+            result += """
+    cpuType: "rv32imc"
+"""
+        else:
+            result += """
+    cpuType: "rv32imc"
+"""
+        if time_provider:
+            result += """
+    timeProvider: {}
+""".format(time_provider)
+
+        return result
     else:
         raise Exception('Unsupported cpu type: {}'.format(kind))