soc: remove cpu_or_bridge and with_cpu arguments

make.py

@@ -7,7 +7,6 @@ from migen.util.misc import autotype
 from migen.fhdl import simplify
 
 from misoclib.soc import cpuif
-from misoclib.cpu import CPU
 from misoclib.mem.sdram.phy import initsequence
 
 from misoc_import import misoc_import
@@ -147,7 +146,7 @@ CPU type:  {}
  */
 
 """.format(platform_name, args.target, top_class.__name__, soc.cpu_type)
-		if isinstance(soc.cpu_or_bridge, CPU):
+		if soc.cpu_type != "none":
 			cpu_mak = cpuif.get_cpu_mak(soc.cpu_type)
 			write_to_file("software/include/generated/cpu.mak", cpu_mak)
 			linker_output_format = cpuif.get_linker_output_format(soc.cpu_type)

misoclib/cpu/__init__.py

@@ -1,4 +0,0 @@
-from migen.fhdl.std import *
-
-class CPU(Module):
-	pass

misoclib/cpu/lm32/__init__.py

@@ -3,9 +3,7 @@ import os
 from migen.fhdl.std import *
 from migen.bus import wishbone
 
-from misoclib.cpu import CPU
-
-class LM32(CPU):
+class LM32(Module):
 	def __init__(self, platform, eba_reset):
 		self.ibus = i = wishbone.Interface()
 		self.dbus = d = wishbone.Interface()

misoclib/cpu/mor1kx/__init__.py

@@ -3,9 +3,7 @@ import os
 from migen.fhdl.std import *
 from migen.bus import wishbone
 
-from misoclib.cpu import CPU
-
-class MOR1KX(CPU):
+class MOR1KX(Module):
 	def __init__(self, platform, reset_pc):
 		self.ibus = i = wishbone.Interface()
 		self.dbus = d = wishbone.Interface()

misoclib/soc/__init__.py

@@ -6,7 +6,7 @@ from migen.bus import wishbone, csr, wishbone2csr
 
 from misoclib.com.uart.phy import UARTPHY
 from misoclib.com import uart
-from misoclib.cpu import CPU, lm32, mor1kx
+from misoclib.cpu import lm32, mor1kx
 from misoclib.cpu.peripherals import identifier, timer
 
 def mem_decoder(address, start=26, end=29):
@@ -32,9 +32,9 @@ class SoC(Module):
 		"main_ram":	0x40000000, # (shadow @0xc0000000)
 		"csr":		0x60000000, # (shadow @0xe0000000)
 	}
-	def __init__(self, platform, clk_freq, cpu_or_bridge=None,
-				with_cpu=True, cpu_type="lm32", cpu_reset_address=0x00000000,
-							   cpu_boot_file="software/bios/bios.bin",
+	def __init__(self, platform, clk_freq,
+				cpu_type="lm32", cpu_reset_address=0x00000000,
+				cpu_boot_file="software/bios/bios.bin",
 				with_integrated_rom=False, rom_size=0x8000,
 				with_integrated_sram=True, sram_size=4096,
 				with_integrated_main_ram=False, main_ram_size=64*1024,
@@ -44,9 +44,7 @@ class SoC(Module):
 				with_timer=True):
 		self.platform = platform
 		self.clk_freq = clk_freq
-		self.cpu_or_bridge = cpu_or_bridge
 
-		self.with_cpu = with_cpu
 		self.cpu_type = cpu_type
 		if with_integrated_rom:
 			self.cpu_reset_address = 0
@@ -78,16 +76,15 @@ class SoC(Module):
 		self._wb_masters = []
 		self._wb_slaves = []
 
-		if with_cpu:
+		if cpu_type != "none":
 			if cpu_type == "lm32":
-				self.submodules.cpu = lm32.LM32(platform, self.cpu_reset_address)
+				self.add_cpu_or_bridge(lm32.LM32(platform, self.cpu_reset_address))
 			elif cpu_type == "or1k":
-				self.submodules.cpu = mor1kx.MOR1KX(platform, self.cpu_reset_address)
+				self.add_cpu_or_bridge(mor1kx.MOR1KX(platform, self.cpu_reset_address))
 			else:
 				raise ValueError("Unsupported CPU type: "+cpu_type)
-			self.add_wb_master(self.cpu.ibus)
-			self.add_wb_master(self.cpu.dbus)
-			self.cpu_or_bridge = self.cpu
+			self.add_wb_master(self.cpu_or_bridge.ibus)
+			self.add_wb_master(self.cpu_or_bridge.dbus)
 
 			if with_integrated_rom:
 				self.submodules.rom = wishbone.SRAM(rom_size, read_only=True)
@@ -101,8 +98,6 @@ class SoC(Module):
 			if with_integrated_main_ram:
 				self.submodules.main_ram = wishbone.SRAM(main_ram_size)
 				self.register_mem("main_ram", self.mem_map["main_ram"], self.main_ram.bus, main_ram_size)
-		elif cpu_or_bridge is not None and not isinstance(cpu_or_bridge, CPU):
-			self.add_wb_master(cpu_or_bridge.wishbone)
 
 		if with_csr:
 			self.submodules.wishbone2csr = wishbone2csr.WB2CSR(bus_csr=csr.Interface(csr_data_width, csr_address_width))
@@ -119,6 +114,13 @@ class SoC(Module):
 			if with_timer:
 				self.submodules.timer0 = timer.Timer()
 
+	def add_cpu_or_bridge(self, cpu_or_bridge):
+		if self.finalized:
+			raise FinalizeError
+		if hasattr(self, "cpu_or_bridge"):
+			raise NotImplementedError("More than one CPU is not supported")
+		self.submodules.cpu_or_bridge = cpu_or_bridge
+
 	def init_rom(self, data):
 		self.rom.mem.init = data
 
@@ -167,8 +169,8 @@ class SoC(Module):
 
 	def do_finalize(self):
 		registered_mems = [regions[0] for regions in self._memory_regions]
-		if isinstance(self.cpu_or_bridge, CPU):
-			for mem in ["rom", "sram"]:
+		if self.cpu_type != "none":
+			for mem in "rom", "sram":
 				if mem not in registered_mems:
 					raise FinalizeError("CPU needs a {} to be registered with SoC.register_mem()".format(mem))