Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into vexriscv_smp

This commit is contained in:
Dolu1990 2020-07-28 19:11:54 +02:00
parent d284dfbea9 0696b409ab
commit 789a70e7c8
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -27,6 +27,7 @@
- Revert to a single crt0 (avoid ctr/xip variants). - 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 otional DMA bus for Cache Coherency on CPU(s) with DMA/Cache Coherency interface.
- Add AXI-Lite bus standard support. - Add AXI-Lite bus standard support.
- Add VexRiscv SMP CPU support.
[> API changes/Deprecation [> API changes/Deprecation
-------------------------- --------------------------

4
litex/soc/cores/cpu/vexriscv_smp/core.py
View File

@ -12,10 +12,7 @@ from litex.soc.interconnect import wishbone
from litex.soc.interconnect.csr import * from litex.soc.interconnect.csr import *
from litex.soc.cores.cpu import CPU, CPU_GCC_TRIPLE_RISCV32 from litex.soc.cores.cpu import CPU, CPU_GCC_TRIPLE_RISCV32
from litedram.common import LiteDRAMNativePort
import os import os
import os.path
CPU_VARIANTS = { CPU_VARIANTS = {
@ -257,6 +254,7 @@ class VexRiscvSMP(CPU):
) )
] ]
from litedram.common import LiteDRAMNativePort
if "mp" in variant: if "mp" in variant:
ncpus = int(variant[-2]) # FIXME ncpus = int(variant[-2]) # FIXME
for n in range(ncpus): for n in range(ncpus):

2
litex_setup.py
View File

@ -46,7 +46,7 @@ repos = [
("pythondata-cpu-picorv32", ("https://github.com/litex-hub/", False, True, None)), ("pythondata-cpu-picorv32", ("https://github.com/litex-hub/", False, True, None)),
("pythondata-cpu-serv", ("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", ("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-rocket", ("https://github.com/litex-hub/", False, True, None)),
("pythondata-cpu-minerva", ("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)), ("pythondata-cpu-microwatt", ("https://github.com/litex-hub/", False, True, 0xba76652)),