From 8c7e4498adfdb4aea5a0d056590ec18d099ba062 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 14 Feb 2007 00:32:54 -0800 Subject: [PATCH] [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 Cc: Sam Ravnborg Cc: Oleg Verych Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- scripts/mkuboot.sh | 11 +++++++---- 1 file 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 -- 2.20.1