diff --git a/[refs] b/[refs]
index d8da99168fa4..56e015677bdd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7de8e7e3c7b79a72c20c7fd58bd65df3d146b13
+refs/heads/master: 8c7e4498adfdb4aea5a0d056590ec18d099ba062
diff --git a/trunk/scripts/mkuboot.sh b/trunk/scripts/mkuboot.sh
index 52a17ab97eb0..4b06c5eea728 100755
--- a/trunk/scripts/mkuboot.sh
+++ b/trunk/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