integration/builder: split software packages into 'extra'. Closes #36

m-labs · Mar 6, 2016 · 58510dd · 58510dd
1 parent a7d03bc
commit 58510dd
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/misoc/integration/builder.py b/misoc/integration/builder.py
@@ -5,20 +5,24 @@
 from misoc.integration import cpu_interface, soc_sdram, sdram_init
 
 
-__all__ = ["misoc_software_packages", "misoc_directory",
+__all__ = ["misoc_software_packages", "misoc_extra_software_packages",
+           "misoc_directory",
            "Builder", "builder_args", "builder_argdict"]
 
 
-# in build order (for dependencies)
 misoc_software_packages = [
     "libcompiler_rt",
     "libbase",
+    "libnet",
+    "bios"
+]
+
+
+misoc_extra_software_packages = [
     "liballoc",
     "libm",
     "libdyld",
-    "libunwind",
-    "libnet",
-    "bios"
+    "libunwind"
 ]
 
 
@@ -49,10 +53,15 @@ def __init__(self, soc, output_dir=None,
 
         self.software_packages = []
         for name in misoc_software_packages:
-            self.add_software_package(
-                name, os.path.join(misoc_directory, "software", name))
+            self.add_software_package(name)
+
+    def add_extra_software_packages(self):
+        for name in misoc_extra_software_packages:
+            self.add_software_package(name)
 
-    def add_software_package(self, name, src_dir):
+    def add_software_package(self, name, src_dir=None):
+        if src_dir is None:
+            src_dir = os.path.join(misoc_directory, "software", name)
         self.software_packages.append((name, src_dir))
 
     def _generate_includes(self):