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

soc: enforce cpu_reset_address to 0 when with_rom is True

This commit is contained in:
Florent Kermarrec 2015-03-06 08:21:16 +01:00
parent 2b9397ff5b
commit bee8ccf6c7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
misoclib/soc/__init__.py
View File

@ -51,7 +51,10 @@ class SoC(Module):
self.with_cpu = with_cpu self.with_cpu = with_cpu
self.cpu_type = cpu_type self.cpu_type = cpu_type
self.cpu_reset_address = cpu_reset_address if with_rom:
self.cpu_reset_address = 0
else:
self.cpu_reset_address = cpu_reset_address
self.cpu_boot_file = cpu_boot_file self.cpu_boot_file = cpu_boot_file
self.with_rom = with_rom self.with_rom = with_rom
@ -80,9 +83,9 @@ class SoC(Module):
if with_cpu: if with_cpu:
if cpu_type == "lm32": if cpu_type == "lm32":
self.submodules.cpu = lm32.LM32(platform, cpu_reset_address) self.submodules.cpu = lm32.LM32(platform, self.cpu_reset_address)
elif cpu_type == "or1k": elif cpu_type == "or1k":
self.submodules.cpu = mor1kx.MOR1KX(platform, cpu_reset_address) self.submodules.cpu = mor1kx.MOR1KX(platform, self.cpu_reset_address)
else: else:
raise ValueError("Unsupported CPU type: "+cpu_type) raise ValueError("Unsupported CPU type: "+cpu_type)
self.cpu_or_bridge = self.cpu self.cpu_or_bridge = self.cpu