diff options
| author | Mike Frysinger <vapier.adi@gmail.com> | 2007-02-14 00:32:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-14 08:09:51 -0800 |
| commit | 8c7e4498adfdb4aea5a0d056590ec18d099ba062 (patch) | |
| tree | 529d1934c3605fd7da4cbe956867c06fab3b62e9 | |
| parent | b7de8e7e3c7b79a72c20c7fd58bd65df3d146b13 (diff) | |
| download | linux-stable-8c7e4498adfdb4aea5a0d056590ec18d099ba062.tar.gz linux-stable-8c7e4498adfdb4aea5a0d056590ec18d099ba062.tar.bz2 linux-stable-8c7e4498adfdb4aea5a0d056590ec18d099ba062.zip | |
[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>
| -rwxr-xr-x | scripts/mkuboot.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/mkuboot.sh b/scripts/mkuboot.sh index 52a17ab97eb0..4b06c5eea728 100755 --- a/scripts/mkuboot.sh +++ b/scripts/mkuboot.sh @@ -4,12 +4,15 @@ # Build U-Boot image when `mkimage' tool is available. # -MKIMAGE=$(type -path mkimage) +MKIMAGE=$(type -path ${CROSS_COMPILE}mkimage) if [ -z "${MKIMAGE}" ]; then - # Doesn't exist - echo '"mkimage" command not found - U-Boot images will not be built' >&2 - exit 0; + MKIMAGE=$(type -path mkimage) + if [ -z "${MKIMAGE}" ]; then + # Doesn't exist + echo '"mkimage" command not found - U-Boot images will not be built' >&2 + exit 0; + fi fi # Call "mkimage" to create U-Boot image |