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

integration/soc_core: use cpu name as cpu-type for all cpus (mor1kx was instanciated with or1k) 

Keep or1k retro-compatibility for now but add a warning
This commit is contained in:
Florent Kermarrec 2019-04-29 10:14:30 +02:00
parent 4e50f36b72
commit 305b8879de
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,8 @@ from operator import itemgetter
from migen import *
from litex.build.tools import deprecated_warning
from litex.soc.cores import identifier, timer, uart
from litex.soc.cores.cpu import *
from litex.soc.interconnect.csr import *
@ -259,7 +261,9 @@ class SoCCore(Module):
if cpu_type is not None:
if cpu_type == "lm32":
self.add_cpu(lm32.LM32(platform, self.cpu_reset_address, self.cpu_variant))
elif cpu_type == "or1k":
elif cpu_type == "mor1kx" or cpu_type == "or1k":
if cpu_type == "or1k":
deprecated_warning("SoCCore's \"cpu-type\" to \"mor1kx\"")
self.add_cpu(mor1kx.MOR1KX(platform, self.cpu_reset_address, self.cpu_variant))
elif cpu_type == "picorv32":
self.add_cpu(picorv32.PicoRV32(platform, self.cpu_reset_address, self.cpu_variant))
@ -357,7 +361,7 @@ class SoCCore(Module):
self.submodules.cpu = cpu
def add_cpu_or_bridge(self, cpu_or_bridge):
print("[WARNING] Please update SoCCore's \"add_cpu_or_bridge\" call to \"add_cpu\"")
deprecated_warning("SoCCore's \"add_cpu_or_bridge\" call to \"add_cpu\"")
self.add_cpu(cpu_or_bridge)
self.cpu_or_bridge = self.cpu