Merge "[MIPS] Add MIPS support to build-kernel.sh"
diff --git a/distrib/build-kernel.sh b/distrib/build-kernel.sh
index 8c9f50a..4b50353 100755
--- a/distrib/build-kernel.sh
+++ b/distrib/build-kernel.sh
@@ -134,6 +134,10 @@
             CROSSTOOLCHAIN=i686-linux-android-4.6
             CROSSPREFIX=i686-linux-android-
             ;;
+        mips)
+            CROSSTOOLCHAIN=mipsel-linux-android-4.4.3
+            CROSSPREFIX=mipsel-linux-android-
+            ;;
         *)
             echo "ERROR: Unsupported architecture!"
             exit 1
@@ -148,6 +152,9 @@
     x86)
         ZIMAGE=bzImage
         ;;
+    mips)
+        ZIMAGE=
+        ;;
 esac
 
 # If the cross-compiler is not in the path, try to find it automatically
@@ -165,7 +172,11 @@
             BUILD_TOP=$(cd $BUILD_TOP && pwd)
         fi
     fi
-    CROSSPREFIX=$BUILD_TOP/prebuilt/$HOST_TAG/toolchain/$CROSSTOOLCHAIN/bin/$CROSSPREFIX
+    if [ "$ARCH" = "mips" ]; then
+        CROSSPREFIX=$BUILD_TOP/prebuilts/gcc/$HOST_TAG/$ARCH/$CROSSTOOLCHAIN/bin/$CROSSPREFIX
+    else
+        CROSSPREFIX=$BUILD_TOP/prebuilt/$HOST_TAG/toolchain/$CROSSTOOLCHAIN/bin/$CROSSPREFIX
+    fi
     if [ "$BUILD_TOP" -a -f ${CROSSPREFIX}gcc ]; then
         echo "Auto-config: --cross=$CROSSPREFIX"
     else
@@ -225,8 +236,12 @@
         OUTPUT_VMLINUX=vmlinux-$CONFIG
 esac
 
-cp -f arch/$ARCH/boot/$ZIMAGE $OUTPUT/$OUTPUT_KERNEL
 cp -f vmlinux $OUTPUT/$OUTPUT_VMLINUX
+if [ ! -z $ZIMAGE ]; then
+    cp -f arch/$ARCH/boot/$ZIMAGE $OUTPUT/$OUTPUT_KERNEL
+    echo "Kernel $CONFIG prebuilt images ($OUTPUT_KERNEL and $OUTPUT_VMLINUX) copied to $OUTPUT successfully !"
+else
+    echo "Kernel $CONFIG prebuilt image ($OUTPUT_VMLINUX) copied to $OUTPUT successfully !"
+fi
 
-echo "Kernel $CONFIG prebuilt images ($OUTPUT_KERNEL and $OUTPUT_VMLINUX) copied to $OUTPUT successfully !"
 exit 0
diff --git a/docs/ANDROID-KERNEL.TXT b/docs/ANDROID-KERNEL.TXT
index d5a1930..9305ff0 100644
--- a/docs/ANDROID-KERNEL.TXT
+++ b/docs/ANDROID-KERNEL.TXT
@@ -25,6 +25,11 @@
   cd $KERNEL_SOURCES
   /path/to/rebuild-kernel.sh --arch=x86 --out=$ANDROID/prebuilt/android-x86/kernel
 
+To rebuild the MIPS kernel:
+
+  cd $KERNEL_SOURCES
+  /path/to/rebuild-kernel.sh --arch=mips --out=$ANDROID/prebuilts/qemu-kernel/mips
+
 Note that you will need to have your cross-toolchain in your path.
 If this is not the case, the script will complain and give you the
 expected name. Use --cross=<prefix> to specify a different toolchain.