Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[firefly-linux-kernel-4.4.55.git] / scripts / extract-ikconfig

diff --git a/scripts/extract-ikconfig b/scripts/extract-ikconfig
index 42d6bcefb400bc3d96c8897eb85f9cc9fd892521..de233ff43c1c3e73b0b93cf04bcbb9105db16570 100755 (executable)
--- a/scripts/extract-ikconfig
+++ b/scripts/extract-ikconfig
@@ -59,6 +59,8 @@ dump_config "$image"
 GZHDR1="0x1f 0x8b 0x08 0x00"
 GZHDR2="0x1f 0x8b 0x08 0x08"
 
+ELFHDR="0x7f 0x45 0x4c 0x46"
+
 # vmlinux.gz: Check for a compressed images
 off=`$binoffset "$image" $GZHDR1 2>/dev/null`
 [ "$?" != "0" ] && off="-1"
@@ -73,6 +75,14 @@ elif [ "$off" -ne "-1" ]; then
        (dd ibs="$off" skip=1 count=0 && dd bs=512k) <"$image" 2>/dev/null | \
                zcat >"$TMPFILE"
        dump_config "$TMPFILE"
+
+# check if this is simply an ELF file
+else
+       off=`$binoffset "$image" $ELFHDR 2>/dev/null`
+       [ "$?" != "0" ] && off="-1"
+       if [ "$off" -eq "0" ]; then
+               dump_config "$image"
+       fi
 fi
 
 echo "ERROR: Unable to extract kernel configuration information."