Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c7e4498 authored by Mike Frysinger's avatar Mike Frysinger Committed by Linus Torvalds
Browse files

[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: default avatarMike Frysinger <vapier@gentoo.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Oleg Verych <olecom@flower.upol.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b7de8e7e

scripts/mkuboot.sh

+7 −4
Original line number Diff line number Diff line
@@ -4,13 +4,16 @@ 
# Build U-Boot image when `mkimage' tool is available.

#



MKIMAGE=$(type -path mkimage)

MKIMAGE=$(type -path ${CROSS_COMPILE}mkimage)



if [ -z "${MKIMAGE}" ]; then

	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

${MKIMAGE} "$@"