summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target/arm/Makefile8
-rw-r--r--target/arm/sys-available/qemu-arm1
-rw-r--r--target/arm/sys-available/raspberry-pi1
-rw-r--r--target/arm/sys-available/sharp-zaurus1
-rw-r--r--target/config/Config.in4
5 files changed, 9 insertions, 6 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile
index 0007e8a36..6dc9cd306 100644
--- a/target/arm/Makefile
+++ b/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
diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm
index 1e62f2abb..141e80d25 100644
--- a/target/arm/sys-available/qemu-arm
+++ b/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).
diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi
index b8753c36d..9d743ed18 100644
--- a/target/arm/sys-available/raspberry-pi
+++ b/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
diff --git a/target/arm/sys-available/sharp-zaurus b/target/arm/sys-available/sharp-zaurus
index f236cb350..848dfdbd1 100644
--- a/target/arm/sys-available/sharp-zaurus
+++ b/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)
diff --git a/target/config/Config.in b/target/config/Config.in
index d6cfaafd0..e38d19cd3 100644
--- a/target/config/Config.in
+++ b/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"