litex_json2renode: correct VexRiscv variants

corrrect the VexRiscv variants. Signed-off-by: Fin Maaß <[email protected]>
VOGL-electronic · Jun 11, 2024 · 4b813cc · 4b813cc
1 parent 1ee2e3a
commit 4b813cc
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/litex/tools/litex_json2renode.py b/litex/tools/litex_json2renode.py
@@ -219,23 +219,29 @@ def get_cpu_count(csr):
 vexriscv_common_kind = {
     'name': 'VexRiscv',
     'variants': {
-        'linux': {
-             'properties': ['cpuType: "rv32ima"', 'privilegeArchitecture: PrivilegeArchitecture.Priv1_10'],
-        },
-        'i': {
-             'properties': ['cpuType: "rv32i"'], 
+        'minimal': {
+             'properties': ['cpuType: "rv32i_zicsr_zifencei"'],
         },
-        'im': {
-             'properties': ['cpuType: "rv32im"'], 
+        'lite': {
+             'properties': ['cpuType: "rv32im_zicsr_zifencei"'],
         },
-        'ima': {
-             'properties': ['cpuType: "rv32ima"'], 
+        'standard': {
+             'properties': ['cpuType: "rv32im_zicsr_zifencei"'],
         },
         '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': {
-             'properties': ['cpuType: "rv32im"'],
+             'properties': ['cpuType: "rv32im_zicsr_zifencei"'],
         }
     },
     'supports_time_provider': True,
@@ -628,7 +634,7 @@ def handled_peripheral(csr, name, **kwargs):
     'sdram': {
         'handler': generate_silencer
     },
-    'spiflash': {
+    'spiflash_core': {
         'handler': generate_spiflash
     },
     'spi': {