Merge branch 'master' into vexriscv_smp

diff --git a/CHANGES b/CHANGES
index ed4399a74681255619dae74a040613465eff2169..836fead16a5851756323be19f78abe660beec87f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,7 @@
        - Revert to a single crt0 (avoid ctr/xip variants).
        - Add otional DMA bus for Cache Coherency on CPU(s) with DMA/Cache Coherency interface.
        - Add AXI-Lite bus standard support.
+       - Add VexRiscv SMP CPU support.
 
        [> API changes/Deprecation
        --------------------------

diff --git a/litex/soc/cores/cpu/vexriscv_smp/core.py b/litex/soc/cores/cpu/vexriscv_smp/core.py
index 4f73c141d455710a3fed731dbc206a3c3562d94a..2fe60b253ef60c6c0422e0c47835137ed9278206 100644 (file)
--- a/litex/soc/cores/cpu/vexriscv_smp/core.py
+++ b/litex/soc/cores/cpu/vexriscv_smp/core.py
@@ -12,10 +12,7 @@ from litex.soc.interconnect import wishbone
 from litex.soc.interconnect.csr import *
 from litex.soc.cores.cpu import CPU, CPU_GCC_TRIPLE_RISCV32
 
-from litedram.common import LiteDRAMNativePort
-
 import os
-import os.path
 
 
 CPU_VARIANTS = {
@@ -257,6 +254,7 @@ class VexRiscvSMP(CPU):
                 )
             ]
 
+        from litedram.common import LiteDRAMNativePort
         if "mp" in variant:
             ncpus = int(variant[-2]) # FIXME
             for n in range(ncpus):

diff --git a/litex_setup.py b/litex_setup.py
index 9eb91a7f976fa59d551c6f27ec1a45f65053f567..d1e9a6cafe4ea5d1298a9729c6519f368e103ebf 100755 (executable)
--- a/litex_setup.py
+++ b/litex_setup.py
@@ -46,7 +46,7 @@ repos = [
     ("pythondata-cpu-picorv32",    ("https://github.com/litex-hub/", False, True, None)),
     ("pythondata-cpu-serv",        ("https://github.com/litex-hub/", False, True, None)),
     ("pythondata-cpu-vexriscv",    ("https://github.com/litex-hub/", False, True, None)),
-    ("pythondata-cpu-vexriscv_smp",("https://github.com/litex-hub/", True,  True, None)),
+    ("pythondata-cpu-vexriscv-smp",("https://github.com/litex-hub/", True,  True, None)),
     ("pythondata-cpu-rocket",      ("https://github.com/litex-hub/", False, True, None)),
     ("pythondata-cpu-minerva",     ("https://github.com/litex-hub/", False, True, None)),
     ("pythondata-cpu-microwatt",   ("https://github.com/litex-hub/", False, True, 0xba76652)),