[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 <[email protected]> Cc: Sam Ravnborg <[email protected]> Cc: Oleg Verych <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
bspratt · Feb 14, 2007 · 8c7e449 · 8c7e449
1 parent b7de8e7
commit 8c7e449
Showing 1 changed file with 7 additions and 4 deletions.
diff --git 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