diff --git a/litex/soc/cores/cpu/naxriscv/core.py b/litex/soc/cores/cpu/naxriscv/core.py
index cddc2f934..b5fe211bb 100755
--- a/litex/soc/cores/cpu/naxriscv/core.py
+++ b/litex/soc/cores/cpu/naxriscv/core.py
@@ -302,6 +302,7 @@ class NaxRiscv(CPU):
 
         # Define ISA.
         soc.add_config("CPU_ISA", NaxRiscv.get_arch())
+        soc.add_config("CPU_MMU", "sv39")
 
         # Add PLIC Bus (AXILite Slave).
         self.plicbus = plicbus  = axi.AXILiteInterface(address_width=32, data_width=32)
diff --git a/litex/soc/cores/cpu/rocket/core.py b/litex/soc/cores/cpu/rocket/core.py
index fabd365a5..b605954e8 100644
--- a/litex/soc/cores/cpu/rocket/core.py
+++ b/litex/soc/cores/cpu/rocket/core.py
@@ -367,7 +367,8 @@ class Rocket(CPU):
 
         # Define number of CPUs
         soc.add_config("CPU_COUNT", num_cores)
-        soc.add_config("CPU_ISA", self.get_arch(self.variant))
+        soc.add_config("CPU_ISA",   self.get_arch(self.variant))
+        soc.add_config("CPU_MMU",   "sv39")
 
         # Constants for Cache so we can add them in the DTS.
         soc.add_config("CPU_DCACHE_SIZE",       4096) # CHECKME: correct/hardwired?
diff --git a/litex/soc/cores/cpu/vexriscv_smp/core.py b/litex/soc/cores/cpu/vexriscv_smp/core.py
index e8a1ce4ee..69ff2d034 100755
--- a/litex/soc/cores/cpu/vexriscv_smp/core.py
+++ b/litex/soc/cores/cpu/vexriscv_smp/core.py
@@ -401,7 +401,9 @@ class VexRiscvSMP(CPU):
 
         # Define number of CPUs
         soc.add_config("CPU_COUNT", VexRiscvSMP.cpu_count)
-        soc.add_config("CPU_ISA", VexRiscvSMP.get_arch())
+        soc.add_config("CPU_ISA",   VexRiscvSMP.get_arch())
+        soc.add_config("CPU_MMU",   "sv32")
+
         # Constants for cache so we can add them in the DTS.
         if (VexRiscvSMP.dcache_size > 0):
             soc.add_config("CPU_DCACHE_SIZE", VexRiscvSMP.dcache_size)
diff --git a/litex/tools/litex_json2dts_linux.py b/litex/tools/litex_json2dts_linux.py
index 284986c9b..628c24184 100755
--- a/litex/tools/litex_json2dts_linux.py
+++ b/litex/tools/litex_json2dts_linux.py
@@ -13,14 +13,28 @@ import argparse
 import os
 
 def generate_dts(d, initrd_start=None, initrd_size=None, initrd=None, root_device=None, polling=False):
-
     kB = 1024
     mB = kB*1024
 
-    cpu_name = d["constants"]["config_cpu_human_name"]
-
     aliases = {}
 
+    # CPU Architectures ----------------------------------------------------------------------------
+    # CHECKME: Move to core and generate a constant for each CPU?
+    cpu_architectures = {
+        "mor1kx"             : "or1k",
+        "marocchino"         : "or1k",
+        "vexriscv smp-linux" : "riscv",
+        "rocketrv64[imac]"   : "riscv",
+        "naxriscv"           : "riscv",
+    }
+
+    # CPU Parameters -------------------------------------------------------------------------------
+    ncpus    = int(d["constants"].get("config_cpu_count", 1))
+    cpu_name = d["constants"].get("config_cpu_human_name")
+    cpu_arch = cpu_architectures[cpu_name]
+    cpu_isa  = d["constants"].get("config_cpu_isa", None)
+    cpu_mmu  = d["constants"].get("config_cpu_mmu", None)
+
     # Header ---------------------------------------------------------------------------------------
     dts = """
 /dts-v1/;
@@ -32,19 +46,14 @@ def generate_dts(d, initrd_start=None, initrd_size=None, initrd=None, root_devic
 """
 
     # Boot Arguments -------------------------------------------------------------------------------
-    cpu_architectures = {
-        "mor1kx"             : "or1k",
-        "marocchino"         : "or1k",
-        "vexriscv smp-linux" : "riscv",
-        "rocketrv64[imac]"   : "riscv",
-    }
+
     default_initrd_start = {
         "or1k":   8*mB,
         "riscv": 16*mB,
     }
     default_initrd_size = 8*mB
 
-    cpu_arch = cpu_architectures[cpu_name]
+
     if initrd_start is None:
         initrd_start = default_initrd_start[cpu_arch]
 
@@ -122,9 +131,6 @@ def generate_dts(d, initrd_start=None, initrd_size=None, initrd=None, root_devic
     i_tlb_size = d["constants"]["config_cpu_itlb_size"],
     i_tlb_ways = d["constants"]["config_cpu_itlb_ways"])
 
-        # CPU(s) Count.
-        ncpus = int(d["constants"].get("config_cpu_count", 1))
-
         # CPU(s) Topology.
         cpu_map = ""
         if ncpus > 1:
@@ -152,7 +158,7 @@ def generate_dts(d, initrd_start=None, initrd_size=None, initrd=None, root_devic
                 device_type = "cpu";
                 compatible = "riscv";
                 riscv,isa = "{cpu_isa}";
-                mmu-type = "riscv,sv32";
+                mmu-type = "riscv,{cpu_mmu}";
                 reg = <{cpu}>;
                 clock-frequency = <{sys_clk_freq}>;
                 status = "okay";
@@ -164,14 +170,19 @@ def generate_dts(d, initrd_start=None, initrd_size=None, initrd=None, root_devic
                     compatible = "riscv,cpu-intc";
                 }};
             }};
-""".format(cpu=cpu, irq=cpu, sys_clk_freq=d["constants"]["config_clock_frequency"], cpu_isa=d["constants"]["config_cpu_isa"], cache_desc=cache_desc, tlb_desc=tlb_desc)
+""".format(cpu=cpu, irq=cpu,
+    sys_clk_freq = d["constants"]["config_clock_frequency"],
+    cpu_isa      = cpu_isa,
+    cpu_mmu      = cpu_mmu,
+    cache_desc   = cache_desc,
+    tlb_desc     = tlb_desc)
         dts += """
             {cpu_map}
         }};
 """.format(cpu_map=cpu_map)
 
-    # Mor1kx
-    # ------
+    # Or1k
+    # ----
     elif cpu_arch == "or1k":
         dts += """
         cpus {{