Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/misoc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5a3f4e417985
Choose a base ref
...
head repository: m-labs/misoc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d8fd4fe7257e
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Aug 13, 2015

  1. All commands run should be checked.

    @mithro @sbourdeauducq
    mithro authored and sbourdeauducq committed Aug 13, 2015
    Copy the full SHA
    d00e774 View commit details

  2. Use shell for globbing in clean.

    @mithro @sbourdeauducq
    mithro authored and sbourdeauducq committed Aug 13, 2015
    Copy the full SHA
    eeda704 View commit details

  3. Use shutil rather then rm -rf command.

    @mithro @sbourdeauducq
    mithro authored and sbourdeauducq committed Aug 13, 2015
    Copy the full SHA
    d8fd4fe View commit details
Showing with 8 additions and 6 deletions.
  1. +8 −6 make.py
14 changes: 8 additions & 6 deletions make.py
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
import argparse
import subprocess
import struct
import shutil

from mibuild.tools import write_to_file
from migen.util.misc import autotype
@@ -136,11 +137,12 @@ def _get_args():
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"])
shutil.rmtree("build") # Need shell for the build/* globbing
os.mkdir("build")
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 = """/*
@@ -207,7 +209,7 @@ def _get_args():
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: