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

soc_core: remove add_cpu method (when no real CPU but only wishbone masters, self.cpu is declared as CPUNone)

This commit is contained in:
Florent Kermarrec 2019-11-08 12:55:29 +01:00
parent f1714405c3
commit db4739df81
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,8 +169,8 @@ class SoCCore(Module):
# Check type # Check type
if cpu_type not in cpu.CPUS.keys(): if cpu_type not in cpu.CPUS.keys():
raise ValueError("Unsupported CPU type: {}".format(cpu_type)) raise ValueError("Unsupported CPU type: {}".format(cpu_type))
# Add the CPU # Declare the CPU
self.add_cpu(cpu.CPUS[cpu_type](platform, self.cpu_variant)) self.submodules.cpu = cpu.CPUS[cpu_type](platform, self.cpu_variant)
# Update Memory Map (if defined by CPU) # Update Memory Map (if defined by CPU)
self.soc_mem_map.update(self.cpu.mem_map) self.soc_mem_map.update(self.cpu.mem_map)
@ -200,7 +200,7 @@ class SoCCore(Module):
if with_ctrl: if with_ctrl:
self.comb += self.cpu.reset.eq(self.ctrl.reset) self.comb += self.cpu.reset.eq(self.ctrl.reset)
else: else:
self.add_cpu(cpu.CPUNone()) self.submodules.cpu = cpu.CPUNone()
self.soc_io_regions.update(self.cpu.io_regions) self.soc_io_regions.update(self.cpu.io_regions)
# Add user's interrupts (needs to be done after CPU interrupts are allocated) # Add user's interrupts (needs to be done after CPU interrupts are allocated)
@ -270,13 +270,6 @@ class SoCCore(Module):
# Methods -------------------------------------------------------------------------------------- # Methods --------------------------------------------------------------------------------------
def add_cpu(self, cpu):
if self.finalized:
raise FinalizeError
if hasattr(self, "cpu"):
raise NotImplementedError("More than one CPU is not supported")
self.submodules.cpu = cpu
def add_interrupt(self, interrupt_name, interrupt_id=None, allow_user_defined=False): def add_interrupt(self, interrupt_name, interrupt_id=None, allow_user_defined=False):
# Check that interrupt_name is not already used # Check that interrupt_name is not already used
if interrupt_name in self.soc_interrupt_map.keys(): if interrupt_name in self.soc_interrupt_map.keys():
@ -456,7 +449,7 @@ class SoCCore(Module):
def do_finalize(self): def do_finalize(self):
# Verify CPU has required memories # Verify CPU has required memories
if self.cpu_type is not None: if not isinstance(self.cpu, cpu.CPUNone):
for name in ["rom", "sram"]: for name in ["rom", "sram"]:
if name not in self.mem_regions.keys(): if name not in self.mem_regions.keys():
raise FinalizeError("CPU needs \"{}\" to be defined as memory or linker region".format(name)) raise FinalizeError("CPU needs \"{}\" to be defined as memory or linker region".format(name))
@ -504,16 +497,15 @@ class SoCCore(Module):
self.add_constant("CONFIG_" + name.upper() + "_" + value) self.add_constant("CONFIG_" + name.upper() + "_" + value)
# Connect interrupts # Connect interrupts
if hasattr(self, "cpu"): if hasattr(self.cpu, "interrupt"):
if hasattr(self.cpu, "interrupt"): for _name, _id in sorted(self.soc_interrupt_map.items()):
for _name, _id in sorted(self.soc_interrupt_map.items()): if _name in self.cpu.interrupts.keys():
if _name in self.cpu.interrupts.keys(): continue
continue if hasattr(self, _name):
if hasattr(self, _name): module = getattr(self, _name)
module = getattr(self, _name) assert hasattr(module, 'ev'), "Submodule %s does not have EventManager (xx.ev) module" % _name
assert hasattr(module, 'ev'), "Submodule %s does not have EventManager (xx.ev) module" % _name self.comb += self.cpu.interrupt[_id].eq(module.ev.irq)
self.comb += self.cpu.interrupt[_id].eq(module.ev.irq) self.constants[_name.upper() + "_INTERRUPT"] = _id
self.constants[_name.upper() + "_INTERRUPT"] = _id
# API retro-compatibility layer ---------------------------------------------------------------- # API retro-compatibility layer ----------------------------------------------------------------