arm: Makefile: add bootimg/zbootimg target

diff --git a/Makefile b/Makefile
index 7be29d6c48cd138952d043b32e3ef67d5088b8c4..a606202c67351bc0f4fdd237754b4625cad9a269 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -183,8 +183,12 @@ export KBUILD_BUILDHOST := $(SUBARCH)
 #ARCH          ?= $(SUBARCH)
 #CROSS_COMPILE ?=
 ARCH           ?= arm
-#CROSS_COMPILE :=/opt/android0320/mydroid/prebuilt/linux-x86/toolchain/arm-eabi-4.2.1/bin/arm-eabi-
-CROSS_COMPILE  ?=../toolchain/arm-eabi-4.4.0/bin/arm-eabi-
+ifneq ($(wildcard ../toolchain/arm-eabi-4.4.0),)
+CROSS_COMPILE  ?= ../toolchain/arm-eabi-4.4.0/bin/arm-eabi-
+endif
+ifneq ($(wildcard ../prebuilt/linux-x86/toolchain/arm-eabi-4.4.0),)
+CROSS_COMPILE  ?= ../prebuilt/linux-x86/toolchain/arm-eabi-4.4.0/bin/arm-eabi-
+endif
 
 # Architecture as present in compile.h
 UTS_MACHINE    := $(ARCH)

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index c101382c4afe0901d0a00400011c3bc52f0dfe96..573a9b24fdff6f32c49cc4ebf4c6bbe363752553 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -280,9 +280,29 @@ zkernel.img: zImage FORCE
        $(Q)$(srctree)/mkkrnlimg $(obj)/arch/arm/boot/zImage $(obj)/kernel.img
        @echo '  Image:  kernel.img is ready'
 
+checkandroid: FORCE
+       $(Q)test -n "$(OUT)" || (echo "Run 'cd .. && . build/envsetup.sh && setpaths && cd -' first to build boot.img"; /bin/false)
+       $(Q)test -x $(srctree)/../out/host/linux-x86/bin/mkbootimg || (echo "No $(srctree)/../out/host/linux-x86/bin/mkbootimg"; /bin/false)
+       $(Q)test -e $(OUT)/ramdisk.img || (echo "No $(OUT)/ramdisk.img"; /bin/false)
+
+PHONY += bootimg boot.img zbootimg zboot.img
+bootimg boot.img: Image checkandroid FORCE
+       $(Q)cp -a $(obj)/arch/arm/boot/Image $(OUT)/kernel
+       $(Q)mkbootimg --kernel $(OUT)/kernel --ramdisk $(OUT)/ramdisk.img --output $(OUT)/boot.img
+       @echo '  Image:  $(OUT)/boot.img is ready'
+
+zbootimg zboot.img: zImage checkandroid FORCE
+       $(Q)cp -a $(obj)/arch/arm/boot/zImage $(OUT)/kernel
+       $(Q)mkbootimg --kernel $(OUT)/kernel --ramdisk $(OUT)/ramdisk.img --output $(OUT)/boot.img
+       @echo '  Image:  $(OUT)/boot.img is ready'
+
 define archhelp
   echo  '  kernel.img    - Rockchip kernel image'
   echo  '  zkernel.img   - Compressed Rockchip kernel image'
+  echo  '  boot.img'
+  echo  '  bootimg       - Android boot image'
+  echo  '  zboot.img'
+  echo  '  zbootimg      - Compressed Android boot image'
   echo  '* zImage        - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
   echo  '  Image         - Uncompressed kernel image (arch/$(ARCH)/boot/Image)'
   echo  '* xipImage      - XIP kernel image, if configured (arch/$(ARCH)/boot/xipImage)'