diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /scripts/mkuboot.sh | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'scripts/mkuboot.sh')
| -rwxr-xr-x | scripts/mkuboot.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mkuboot.sh b/scripts/mkuboot.sh index 2e3d3cd916b8..446739c7843a 100755 --- a/scripts/mkuboot.sh +++ b/scripts/mkuboot.sh | |||
| @@ -11,7 +11,7 @@ if [ -z "${MKIMAGE}" ]; then | |||
| 11 | if [ -z "${MKIMAGE}" ]; then | 11 | if [ -z "${MKIMAGE}" ]; then |
| 12 | # Doesn't exist | 12 | # Doesn't exist |
| 13 | echo '"mkimage" command not found - U-Boot images will not be built' >&2 | 13 | echo '"mkimage" command not found - U-Boot images will not be built' >&2 |
| 14 | exit 0; | 14 | exit 1; |
| 15 | fi | 15 | fi |
| 16 | fi | 16 | fi |
| 17 | 17 | ||