mor1kx: sync
[litex.git] / make.py
diff --git a/make.py b/make.py
index 8d6edf3820b0d3a8697e66ca3e468a8dd174a5d5..98bee0b3b10dd9db29507f5e93fae4ba58ec4d8b 100755 (executable)
--- a/make.py
+++ b/make.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-import sys, os, argparse, importlib, subprocess, struct
+import sys, os, argparse, subprocess, struct
 
 from mibuild.tools import write_to_file
 from migen.util.misc import autotype
@@ -8,7 +8,8 @@ from migen.fhdl import simplify
 
 from misoclib.gensoc import cpuif
 from misoclib.sdramphy import initsequence
-import programmer
+
+from misoc_import import misoc_import
 
 def _get_args():
        parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter,
@@ -21,7 +22,7 @@ One or several actions can be specified:
 clean           delete previous build(s).
 build-bitstream build FPGA bitstream. Implies build-bios on targets with
                 integrated BIOS.
-build-headers   build software header files with CSR/IRQ/SDRAM_PHY definitions.
+build-headers   build software header files with CPU/CSR/IRQ/SDRAM_PHY definitions.
 build-csr-csv   save CSR map into CSV file.
 build-bios      build BIOS. Implies build-header.
 
@@ -38,6 +39,7 @@ Load/flash actions use the existing outputs, and do not trigger new builds.
        parser.add_argument("-s", "--sub-target", default="", help="variant of the SoC type to build")
        parser.add_argument("-p", "--platform", default=None, help="platform to build for")
        parser.add_argument("-Ot", "--target-option", default=[], nargs=2, action="append", help="set target-specific option")
+       parser.add_argument("-Op", "--platform-option", default=[], nargs=2, action="append", help="set platform-specific option")
        parser.add_argument("-X", "--external", default="", help="use external directory for targets, platforms and imports")
        parser.add_argument("--csr_csv", default="csr.csv", help="CSV file to save the CSR map into")
        
@@ -49,20 +51,6 @@ Load/flash actions use the existing outputs, and do not trigger new builds.
 
        return parser.parse_args()
 
-def _misoc_import(default, external, name):
-       if external:
-               try:
-                       del sys.modules[name] # force external path search
-               except KeyError:
-                       pass
-               loader = importlib.find_loader(name, [external])
-               if loader is None:
-                       # try internal import
-                       return importlib.import_module(default + "." + name)
-               return loader.load_module()
-       else:
-               return importlib.import_module(default + "." + name)
-
 if __name__ == "__main__":
        args = _get_args()
 
@@ -74,7 +62,7 @@ if __name__ == "__main__":
                sys.path.insert(1, os.path.abspath(args.external))
 
        # create top-level SoC object
-       target_module = _misoc_import("targets", external_target, args.target)
+       target_module = misoc_import("targets", external_target, args.target)
        if args.sub_target:
                top_class = getattr(target_module, args.sub_target)
        else:
@@ -84,8 +72,9 @@ if __name__ == "__main__":
                platform_name = top_class.default_platform
        else:
                platform_name = args.platform
-       platform_module = _misoc_import("mibuild.platforms", external_platform, platform_name)
-       platform = platform_module.Platform()
+       platform_module = misoc_import("mibuild.platforms", external_platform, platform_name)
+       platform_kwargs = dict((k, autotype(v)) for k, v in args.platform_option)
+       platform = platform_module.Platform(**platform_kwargs)
        if args.external:
                platform.soc_ext_path = os.path.abspath(args.external)
 
@@ -119,7 +108,8 @@ a high performance and small footprint SoC based on Migen
 Platform:  {}
 Target:    {}
 Subtarget: {}
-===========================""".format(platform_name, args.target, top_class.__name__))
+CPU type:  {}
+===========================""".format(platform_name, args.target, top_class.__name__, soc.cpu_type))
 
        # dependencies
        if actions["all"]:
@@ -135,17 +125,27 @@ Subtarget: {}
 
        if actions["clean"]:
                subprocess.call(["rm", "-rf", "build/*"])
+               subprocess.call(["make", "-C", "software/libcompiler-rt", "clean"])
+               subprocess.call(["make", "-C", "software/libbase", "clean"])
+               subprocess.call(["make", "-C", "software/libnet", "clean"])
+               subprocess.call(["make", "-C", "software/bios", "clean"])
 
        if actions["build-headers"]:
                boilerplate = """/*
  * Platform:  {}
  * Target:    {}
  * Subtarget: {}
+ * CPU type:  {}
  */
 
-""".format(platform_name, args.target, top_class.__name__)
-               linker_header = cpuif.get_linker_regions(soc.cpu_memory_regions)
-               write_to_file("software/include/generated/regions.ld", boilerplate + linker_header)
+""".format(platform_name, args.target, top_class.__name__, soc.cpu_type)
+               cpu_mak = cpuif.get_cpu_mak(soc.cpu_type)
+               write_to_file("software/include/generated/cpu.mak", cpu_mak)
+               linker_output_format = cpuif.get_linker_output_format(soc.cpu_type)
+               write_to_file("software/include/generated/output_format.ld", linker_output_format)
+
+               linker_regions = cpuif.get_linker_regions(soc.cpu_memory_regions)
+               write_to_file("software/include/generated/regions.ld", boilerplate + linker_regions)
                try:
                        flash_boot_address = soc.flash_boot_address
                except AttributeError:
@@ -168,27 +168,28 @@ Subtarget: {}
                if ret:
                        raise OSError("BIOS build failed")
 
-       if hasattr(soc, "init_bios_memory"):
-               with open("software/bios/bios.bin", "rb") as bios_file:
-                       bios_data = []
-                       while True:
-                               w = bios_file.read(4)
-                               if not w:
-                                       break
-                               bios_data.append(struct.unpack(">I", w)[0])
-               soc.init_bios_memory(bios_data)
-
        if actions["build-bitstream"]:
+               if hasattr(soc, "init_bios_memory"):
+                       with open("software/bios/bios.bin", "rb") as bios_file:
+                               bios_data = []
+                               while True:
+                                       w = bios_file.read(4)
+                                       if not w:
+                                               break
+                                       bios_data.append(struct.unpack(">I", w)[0])
+                       soc.init_bios_memory(bios_data)
+
                for decorator in args.decorate:
                        soc = getattr(simplify, decorator)(soc)
                build_kwargs = dict((k, autotype(v)) for k, v in args.build_option)
                platform.build(soc, build_name=build_name, **build_kwargs)
 
        if actions["load-bitstream"] or actions["flash-bitstream"] or actions["flash-bios"]:
-               prog = programmer.create_programmer(platform.name, args.flash_proxy_dir)
+               prog = platform.create_programmer()
                if actions["load-bitstream"]:
                        prog.load_bitstream("build/" + build_name + platform.bitstream_ext)
                if actions["flash-bitstream"]:
+                       prog.set_flash_proxy_dir(args.flash_proxy_dir)
                        if prog.needs_bitreverse:
                                flashbit = "build/" + build_name + ".fpg"
                                subprocess.call(["tools/byteswap",
@@ -198,4 +199,5 @@ Subtarget: {}
                                flashbit = "build/" + build_name + ".bin"
                        prog.flash(0, flashbit)
                if actions["flash-bios"]:
+                       prog.set_flash_proxy_dir(args.flash_proxy_dir)
                        prog.flash(soc.cpu_reset_address, "software/bios/bios.bin")