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

soc: remove cpu_boot_file argument

This commit is contained in:
Sebastien Bourdeauducq 2015-04-01 17:32:45 +08:00
parent fb86445d14
commit 9599eb6fae
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
make.py
View File

@ -88,6 +88,8 @@ if __name__ == "__main__":
memory_regions = soc.get_memory_regions() memory_regions = soc.get_memory_regions()
csr_regions = soc.get_csr_regions() csr_regions = soc.get_csr_regions()
bios_file = "software/bios/bios.bin"
# decode actions # decode actions
action_list = ["clean", "build-bitstream", "build-headers", "build-csr-csv", "build-bios", action_list = ["clean", "build-bitstream", "build-headers", "build-csr-csv", "build-bios",
"load-bitstream", "flash-bitstream", "flash-bios", "all"] "load-bitstream", "flash-bitstream", "flash-bios", "all"]
@ -175,7 +177,7 @@ CPU type: {}
if actions["build-bitstream"]: if actions["build-bitstream"]:
if soc.with_integrated_rom: if soc.with_integrated_rom:
with open(soc.cpu_boot_file, "rb") as boot_file: with open(bios_file, "rb") as boot_file:
boot_data = [] boot_data = []
while True: while True:
w = boot_file.read(4) w = boot_file.read(4)
@ -209,4 +211,4 @@ CPU type: {}
if actions["flash-bios"]: if actions["flash-bios"]:
prog = platform.create_programmer() prog = platform.create_programmer()
prog.set_flash_proxy_dir(args.flash_proxy_dir) prog.set_flash_proxy_dir(args.flash_proxy_dir)
prog.flash(soc.cpu_reset_address, soc.cpu_boot_file) prog.flash(soc.cpu_reset_address, bios_file)

2
misoclib/soc/__init__.py
View File

@ -34,7 +34,6 @@ class SoC(Module):
} }
def __init__(self, platform, clk_freq, def __init__(self, platform, clk_freq,
cpu_type="lm32", cpu_reset_address=0x00000000, cpu_type="lm32", cpu_reset_address=0x00000000,
cpu_boot_file="software/bios/bios.bin",
with_integrated_rom=False, rom_size=0x8000, with_integrated_rom=False, rom_size=0x8000,
with_integrated_sram=True, sram_size=4096, with_integrated_sram=True, sram_size=4096,
with_integrated_main_ram=False, main_ram_size=64*1024, with_integrated_main_ram=False, main_ram_size=64*1024,
@ -50,7 +49,6 @@ class SoC(Module):
self.cpu_reset_address = 0 self.cpu_reset_address = 0
else: else:
self.cpu_reset_address = cpu_reset_address self.cpu_reset_address = cpu_reset_address
self.cpu_boot_file = cpu_boot_file
self.with_integrated_rom = with_integrated_rom self.with_integrated_rom = with_integrated_rom
self.rom_size = rom_size self.rom_size = rom_size