software/bios: move romboot after serialboot and netboot

[litex.git] / make.py

diff --git a/make.py b/make.py
index 087466ba94a6277be6964c3c1049ceafd99f6382..b0d3967d7d4babcbf887a8bfc80b5e42dc1e57fe 100755 (executable)
--- a/make.py
+++ b/make.py
@@ -1,6 +1,10 @@
 #!/usr/bin/env python3
 
-import sys, os, argparse, subprocess, struct
+import sys
+import os
+import argparse
+import subprocess
+import struct
 
 from mibuild.tools import write_to_file
 from migen.util.misc import autotype
@@ -60,7 +64,7 @@ if __name__ == "__main__":
     if args.external:
         external_target = os.path.join(args.external, "targets")
         external_platform = os.path.join(args.external, "platforms")
-        sys.path.insert(1, os.path.abspath(args.external))
+        sys.path.insert(0, os.path.abspath(args.external))
 
     # create top-level SoC object
     target_module = misoc_import("targets", external_target, args.target)
@@ -132,11 +136,11 @@ CPU type:  {}
         actions["build-headers"] = True
 
     if actions["clean"]:
-        subprocess.call(["rm", "-rf", "build/*"])
-        subprocess.call(["make", "-C", os.path.join("software", "libcompiler-rt"), "clean"])
-        subprocess.call(["make", "-C", os.path.join("software", "libbase"), "clean"])
-        subprocess.call(["make", "-C", os.path.join("software", "libnet"), "clean"])
-        subprocess.call(["make", "-C", os.path.join("software", "bios"), "clean"])
+        subprocess.check_call("rm -rvf build/*", shell=True) # Need shell for the build/* globbing
+        subprocess.check_call(["make", "-C", os.path.join("software", "libcompiler-rt"), "clean"])
+        subprocess.check_call(["make", "-C", os.path.join("software", "libbase"), "clean"])
+        subprocess.check_call(["make", "-C", os.path.join("software", "libnet"), "clean"])
+        subprocess.check_call(["make", "-C", os.path.join("software", "bios"), "clean"])
 
     if actions["build-headers"]:
         boilerplate = """/*
@@ -203,7 +207,7 @@ CPU type:  {}
         prog.set_flash_proxy_dir(args.flash_proxy_dir)
         if prog.needs_bitreverse:
             flashbit = os.path.join("build", build_name + ".fpg")
-            subprocess.call([os.path.join("tools", "byteswap"),
+            subprocess.check_call([os.path.join("tools", "byteswap"),
                 os.path.join("build", build_name + ".bin"),
                 flashbit])
         else: