Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8c7e4498adfdb4aea5a0d056590ec18d099ba062
Commit:     8c7e4498adfdb4aea5a0d056590ec18d099ba062
Parent:     b7de8e7e3c7b79a72c20c7fd58bd65df3d146b13
Author:     Mike Frysinger <[EMAIL PROTECTED]>
AuthorDate: Wed Feb 14 00:32:54 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Feb 14 08:09:51 2007 -0800

    [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]>
---
 scripts/mkuboot.sh |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/mkuboot.sh b/scripts/mkuboot.sh
index 52a17ab..4b06c5e 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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to