Commit 8c7e4498adfdb4aea5a0d056590ec18d099ba062
Committed by
Linus Torvalds
Linus Torvalds
1 parent
b7de8e7e3c
Exists in
master
and in
7 other branches
[PATCH] search a little harder for mkimage
Check to see if `${CROSS_COMPILE}mkimage` exists and if not, fall back to
the standard `mkimage`
The Blackfin toolchain includes mkimage, but we dont want to namespace
collide with any of the user's system setup, so we prefix it with our
toolchain name.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Oleg Verych <olecom@flower.upol.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 7 additions and 4 deletions Side-by-side Diff
scripts/mkuboot.sh
| ... | ... | @@ -4,12 +4,15 @@ |
| 4 | 4 | # Build U-Boot image when `mkimage' tool is available. |
| 5 | 5 | # |
| 6 | 6 | |
| 7 | -MKIMAGE=$(type -path mkimage) | |
| 7 | +MKIMAGE=$(type -path ${CROSS_COMPILE}mkimage) | |
| 8 | 8 | |
| 9 | 9 | if [ -z "${MKIMAGE}" ]; then |
| 10 | - # Doesn't exist | |
| 11 | - echo '"mkimage" command not found - U-Boot images will not be built' >&2 | |
| 12 | - exit 0; | |
| 10 | + MKIMAGE=$(type -path mkimage) | |
| 11 | + if [ -z "${MKIMAGE}" ]; then | |
| 12 | + # Doesn't exist | |
| 13 | + echo '"mkimage" command not found - U-Boot images will not be built' >&2 | |
| 14 | + exit 0; | |
| 15 | + fi | |
| 13 | 16 | fi |
| 14 | 17 | |
| 15 | 18 | # Call "mkimage" to create U-Boot image |