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

soc: use self.cpu_reset_address as rom mem_map address and increase default bios size to 0xa000

This commit is contained in:
Florent Kermarrec 2015-02-28 20:04:51 +01:00
parent 6107b7844a
commit 165a5b6760
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
misoclib/soc/__init__.py
View File

@ -27,7 +27,6 @@ class SoC(Module):
"timer0": 1, "timer0": 1,
} }
mem_map = { mem_map = {
"rom": 0x00000000, # (shadow @0x80000000)
"sram": 0x10000000, # (shadow @0x90000000) "sram": 0x10000000, # (shadow @0x90000000)
"sdram": 0x40000000, # (shadow @0xc0000000) "sdram": 0x40000000, # (shadow @0xc0000000)
"csr": 0x60000000, # (shadow @0xe0000000) "csr": 0x60000000, # (shadow @0xe0000000)
@ -35,7 +34,7 @@ class SoC(Module):
def __init__(self, platform, clk_freq, cpu_or_bridge=None, def __init__(self, platform, clk_freq, cpu_or_bridge=None,
with_cpu=True, cpu_type="lm32", cpu_reset_address=0x00000000, with_cpu=True, cpu_type="lm32", cpu_reset_address=0x00000000,
cpu_boot_file="software/bios/bios.bin", cpu_boot_file="software/bios/bios.bin",
with_rom=False, rom_size=0x8000, with_rom=False, rom_size=0xa000,
with_sram=True, sram_size=4096, with_sram=True, sram_size=4096,
with_sdram=False, sdram_size=64*1024, with_sdram=False, sdram_size=64*1024,
with_csr=True, csr_data_width=8, csr_address_width=14, with_csr=True, csr_data_width=8, csr_address_width=14,
@ -87,7 +86,7 @@ class SoC(Module):
if with_rom: if with_rom:
self.submodules.rom = wishbone.SRAM(rom_size, read_only=True) self.submodules.rom = wishbone.SRAM(rom_size, read_only=True)
self.register_mem("rom", self.mem_map["rom"], self.rom.bus, rom_size) self.register_mem("rom", self.cpu_reset_address, self.rom.bus, rom_size)
if with_sram: if with_sram:
self.submodules.sram = wishbone.SRAM(sram_size) self.submodules.sram = wishbone.SRAM(sram_size)
@ -140,7 +139,7 @@ class SoC(Module):
# XXX for retro-compatibilty, we should maybe use directly register_mem in targets # XXX for retro-compatibilty, we should maybe use directly register_mem in targets
def register_rom(self, interface): def register_rom(self, interface):
self.register_mem("rom", self.mem_map["rom"], interface, size=self.rom_size) self.register_mem("rom", self.cpu_reset_address, interface, size=self.rom_size)
def check_csr_region(self, name, origin): def check_csr_region(self, name, origin):
for n, o, l, obj in self.csr_regions: for n, o, l, obj in self.csr_regions: