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

cores/cpu: define CPUS and simplify instance

This commit is contained in:
Florent Kermarrec 2019-09-28 00:55:08 +02:00
parent 9f6a2ae73e
commit a3816096a7
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
litex/soc/cores/cpu/__init__.py
View File

@ -11,6 +11,18 @@ from litex.soc.cores.cpu.minerva import Minerva
from litex.soc.cores.cpu.rocket import RocketRV64 from litex.soc.cores.cpu.rocket import RocketRV64
from litex.soc.cores.cpu.serv import SERV from litex.soc.cores.cpu.serv import SERV
# CPUS ---------------------------------------------------------------------------------------------
CPUS = {
"lm32" : LM32,
"mor1kx" : MOR1KX,
"picorv32" : PicoRV32,
"vexriscv" : VexRiscv,
"minerva" : Minerva,
"rocket" : RocketRV64,
"serv" : SERV
}
# CPU Variants/Extensions Definition --------------------------------------------------------------- # CPU Variants/Extensions Definition ---------------------------------------------------------------
CPU_VARIANTS = { CPU_VARIANTS = {

20
litex/soc/integration/soc_core.py
View File

@ -264,25 +264,9 @@ class SoCCore(Module):
if cpu_variant is not None: if cpu_variant is not None:
self.config["CPU_VARIANT"] = str(cpu_variant.split('+')[0]).upper() self.config["CPU_VARIANT"] = str(cpu_variant.split('+')[0]).upper()
# CPU selection / instance # CPU selection / instance
if cpu_type == "lm32": if cpu_type not in cpu.CPUS.keys():
self.add_cpu(cpu.lm32.LM32(platform, self.cpu_reset_address, self.cpu_variant))
elif cpu_type == "mor1kx" or cpu_type == "or1k":
if cpu_type == "or1k":
deprecated_warning("SoCCore's \"cpu-type\" to \"mor1kx\"")
self.add_cpu(cpu.mor1kx.MOR1KX(platform, self.cpu_reset_address, self.cpu_variant))
elif cpu_type == "picorv32":
self.add_cpu(cpu.picorv32.PicoRV32(platform, self.cpu_reset_address, self.cpu_variant))
elif cpu_type == "vexriscv":
self.add_cpu(cpu.vexriscv.VexRiscv(platform, self.cpu_reset_address, self.cpu_variant))
elif cpu_type == "minerva":
self.add_cpu(cpu.minerva.Minerva(platform, self.cpu_reset_address, self.cpu_variant))
elif cpu_type == "rocket":
self.add_cpu(cpu.rocket.RocketRV64(platform, self.cpu_reset_address, self.cpu_variant))
elif cpu_type == "serv":
self.add_cpu(cpu.serv.SERV(platform, self.cpu_reset_address, self.cpu_variant))
self.add_constant("UART_POLLING", None)
else:
raise ValueError("Unsupported CPU type: {}".format(cpu_type)) raise ValueError("Unsupported CPU type: {}".format(cpu_type))
self.add_cpu(cpu.CPUS[cpu_type](platform, self.cpu_reset_address, self.cpu_variant))
# Add Instruction/Data buses as Wisbone masters # Add Instruction/Data buses as Wisbone masters
self.add_wb_master(self.cpu.ibus) self.add_wb_master(self.cpu.ibus)