fix zImage targets in target/arm

target/arm/Makefile

@@ -7,14 +7,10 @@ include $(TOPDIR)/mk/modules.mk
 include $(TOPDIR)/mk/kernel-build.mk
 include $(TOPDIR)/mk/image.mk
 
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y)
-KERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage
-else ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
-KERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage
-else ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+ifeq ($(ADK_TARGET_KERNEL_ZIMAGE),y)
 KERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage
 else
-KERNEL:=$(LINUX_DIR)/vmlinux
+KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL)
 endif
 
 LOADADDR:=0x20008000

target/arm/sys-available/qemu-arm

@@ -6,5 +6,6 @@ config ADK_TARGET_SYSTEM_QEMU_ARM
 	select ADK_EABI
 	select ADK_TARGET_NO_FPU
 	select ADK_HARDWARE_QEMU
+	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Qemu Emulator (arm).

target/arm/sys-available/raspberry-pi

@@ -15,6 +15,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	select ADK_TARGET_WITH_INPUT
 	select ADK_PACKAGE_BCM2835_FIRMWARE
 	select ADK_PACKAGE_BCM2835_VC
+	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	  Raspberry PI
 

target/arm/sys-available/sharp-zaurus

@@ -17,5 +17,6 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	select ADK_KERNEL_MACH_SPITZ
 	select ADK_KERNEL_PXA_SHARP_Cxx00
 	select ADK_KERNEL_SPI_PXA2XX
+	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Sharp Zaurus CL3200 (Terrier)

target/config/Config.in

@@ -4,11 +4,15 @@
 config ADK_TARGET_KERNEL_VMLINUZ
 	boolean
 
+config ADK_TARGET_KERNEL_ZIMAGE
+	boolean
+
 config ADK_TARGET_KERNEL_BZIMAGE
 	boolean
 
 config ADK_TARGET_KERNEL
 	string
+	default "zImage" if ADK_TARGET_KERNEL_ZIMAGE
 	default "vmlinuz" if ADK_TARGET_KERNEL_VMLINUZ
 	default "bzImage" if ADK_TARGET_KERNEL_BZIMAGE
 	default "vmlinux"