[PATCH] search a little harder for mkimage
Mike Frysinger [Wed, 14 Feb 2007 08:32:54 +0000 (00:32 -0800)]
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>

scripts/mkuboot.sh

index 52a17ab..4b06c5e 100755 (executable)
@@ -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