soc: remove cpu_boot_file argument

diff --git a/make.py b/make.py
index b14dc561088bdc1eee111b658725a7fd18eb3f34..00bd5ecbc22b9166568d041e5e158f7ac2f9ad3c 100755 (executable)
--- a/make.py
+++ b/make.py
@@ -88,6 +88,8 @@ if __name__ == "__main__":
        memory_regions = soc.get_memory_regions()
        csr_regions = soc.get_csr_regions()
 
+       bios_file = "software/bios/bios.bin"
+
        # decode actions
        action_list = ["clean", "build-bitstream", "build-headers", "build-csr-csv", "build-bios",
                "load-bitstream", "flash-bitstream", "flash-bios", "all"]
@@ -175,7 +177,7 @@ CPU type:  {}
 
        if actions["build-bitstream"]:
                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 = []
                                while True:
                                        w = boot_file.read(4)
@@ -209,4 +211,4 @@ CPU type:  {}
        if actions["flash-bios"]:
                prog = platform.create_programmer()
                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)

diff --git a/misoclib/soc/__init__.py b/misoclib/soc/__init__.py
index 21934de187f7f8f5f5a61eb9555da43e5a25097b..07a276b22c0f42f56b3802be0cd29a98fc771a05 100644 (file)
--- a/misoclib/soc/__init__.py
+++ b/misoclib/soc/__init__.py
@@ -34,7 +34,6 @@ class SoC(Module):
        }
        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,
@@ -50,7 +49,6 @@ class SoC(Module):
                        self.cpu_reset_address = 0
                else:
                        self.cpu_reset_address = cpu_reset_address
-               self.cpu_boot_file = cpu_boot_file
 
                self.with_integrated_rom = with_integrated_rom
                self.rom_size = rom_size