Merge branch 'master' of github.com:m-labs/misoc

misoclib/com/liteeth/example_designs/make.py

@@ -72,6 +72,8 @@ if __name__ == "__main__":
 	top_kwargs = dict((k, autotype(v)) for k, v in args.target_option)
 	soc = top_class(platform, **top_kwargs)
 	soc.finalize()
+	memory_regions = soc.get_memory_regions()
+	csr_regions = soc.get_csr_regions()
 
 	# decode actions
 	action_list = ["clean", "build-csr-csv", "build-bitstream", "load-bitstream", "all"]
@@ -121,7 +123,7 @@ System Clk: {} MHz
 		subprocess.call(["rm", "-rf", "build/*"])
 
 	if actions["build-csr-csv"]:
-		csr_csv = cpuif.get_csr_csv(soc.csr_regions)
+		csr_csv = cpuif.get_csr_csv(csr_regions)
 		write_to_file(args.csr_csv, csr_csv)
 
 	if actions["build-bitstream"]:

misoclib/com/liteeth/example_designs/targets/base.py

@@ -23,14 +23,15 @@ class BaseSoC(SoC, AutoCSR):
 			mac_address=0x10e2d5000000,
 			ip_address="192.168.0.42"):
 		clk_freq = int((1/(platform.default_clk_period))*1000000000)
-		self.submodules.uart2wb = LiteScopeUART2WB(platform.request("serial"), clk_freq, baudrate=115200)
-		SoC.__init__(self, platform, clk_freq, self.uart2wb,
-			with_cpu=False,
+		SoC.__init__(self, platform, clk_freq,
+			cpu_type="none",
 			with_csr=True, csr_data_width=32,
 			with_uart=False,
 			with_identifier=True,
 			with_timer=False
 		)
+		self.add_cpu_or_bridge(LiteScopeUART2WB(platform.request("serial"), clk_freq, baudrate=115200))
+		self.add_wb_master(self.cpu_or_bridge.wishbone)
 		self.submodules.crg = CRG(platform.request(platform.default_clk_name))
 
 		# wishbone SRAM (to test Wishbone over UART and Etherbone)

misoclib/mem/litesata/example_designs/make.py

@@ -69,6 +69,8 @@ if __name__ == "__main__":
 	top_kwargs = dict((k, autotype(v)) for k, v in args.target_option)
 	soc = top_class(platform, **top_kwargs)
 	soc.finalize()
+	memory_regions = soc.get_memory_regions()
+	csr_regions = soc.get_csr_regions()
 
 	# decode actions
 	action_list = ["clean", "build-csr-csv", "build-core", "build-bitstream", "load-bitstream", "all"]
@@ -124,7 +126,7 @@ BIST: {}
 		subprocess.call(["rm", "-rf", "build/*"])
 
 	if actions["build-csr-csv"]:
-		csr_csv = cpuif.get_csr_csv(soc.get_csr_regions())
+		csr_csv = cpuif.get_csr_csv(csr_regions)
 		write_to_file(args.csr_csv, csr_csv)
 
 	if actions["build-core"]:

misoclib/soc/sdram.py

@@ -78,7 +78,7 @@ class SDRAMSoC(SoC):
 				raise NotImplementedError("Unsupported SDRAM width of {} > 32".format(sdram_width))
 
 	def do_finalize(self):
-		if not self.integrated_ram_size:
+		if not self.integrated_main_ram_size:
 			if not self._sdram_phy_registered:
 				raise FinalizeError("Need to call SDRAMSoC.register_sdram_phy()")
 		SoC.do_finalize(self)

misoclib/tools/litescope/example_designs/make.py

@@ -72,6 +72,8 @@ if __name__ == "__main__":
 	top_kwargs = dict((k, autotype(v)) for k, v in args.target_option)
 	soc = top_class(platform, **top_kwargs)
 	soc.finalize()
+	memory_regions = soc.get_memory_regions()
+	csr_regions = soc.get_csr_regions()
 
 	# decode actions
 	action_list = ["clean", "build-csr-csv", "build-bitstream", "load-bitstream", "all"]
@@ -130,7 +132,7 @@ RLE: {}
 		subprocess.call(["rm", "-rf", "build/*"])
 
 	if actions["build-csr-csv"]:
-		csr_csv = cpuif.get_csr_csv(soc.csr_regions)
+		csr_csv = cpuif.get_csr_csv(csr_regions)
 		write_to_file(args.csr_csv, csr_csv)
 
 	if actions["build-bitstream"]:

misoclib/tools/litescope/example_designs/targets/simple.py

@@ -16,14 +16,15 @@ class LiteScopeSoC(SoC, AutoCSR):
 	csr_map.update(SoC.csr_map)
 	def __init__(self, platform):
 		clk_freq = int((1/(platform.default_clk_period))*1000000000)
-		self.submodules.uart2wb = LiteScopeUART2WB(platform.request("serial"), clk_freq, baudrate=115200)
-		SoC.__init__(self, platform, clk_freq, self.uart2wb,
-			with_cpu=False,
+		SoC.__init__(self, platform, clk_freq,
+			cpu_type="none",
 			with_csr=True, csr_data_width=32,
 			with_uart=False,
 			with_identifier=True,
 			with_timer=False
 		)
+		self.add_cpu_or_bridge(LiteScopeUART2WB(platform.request("serial"), clk_freq, baudrate=115200))
+		self.add_wb_master(self.cpu_or_bridge.wishbone)
 		self.submodules.crg = CRG(platform.request(platform.default_clk_name))
 
 		self.submodules.io = LiteScopeIO(8)