From c55a696b9c3c6d25342e8e04999a2058da5d8201 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 8 Nov 2013 18:11:03 +0100
Subject: enable variable kernel target name, qemu-mips targets use vmlinuz
---
target/config/Config.in | 8 ++++++++
target/mips/Makefile | 8 +-------
target/mips/sys-available/fon-fon2100 | 1 +
target/mips/sys-available/lemote-yeelong | 1 +
target/mips/sys-available/qemu-mips | 1 +
target/mips/sys-available/qemu-mips64 | 1 +
target/mips/sys-available/qemu-mips64el | 1 +
target/mips/sys-available/qemu-mipsel | 1 +
8 files changed, 15 insertions(+), 7 deletions(-)
(limited to 'target')
diff --git a/target/config/Config.in b/target/config/Config.in
index 1ee04cafe..50649c3ed 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -1,6 +1,14 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
+config ADK_TARGET_KERNEL_VMLINUZ
+ boolean
+
+config ADK_TARGET_KERNEL
+ string
+ default "vmlinuz" if ADK_TARGET_KERNEL_VMLINUZ
+ default "vmlinux"
+
config ADK_big
boolean
diff --git a/target/mips/Makefile b/target/mips/Makefile
index eab6be597..e753eccc5 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -7,13 +7,7 @@ include $(TOPDIR)/mk/modules.mk
include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
-ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
-KERNEL:=$(LINUX_DIR)/vmlinuz
-else ifeq ($(ADK_TARGET_SYSTEM_FON_FON2100),y)
-KERNEL:=$(LINUX_DIR)/vmlinuz
-else
-KERNEL:=$(LINUX_DIR)/vmlinux
-endif
+KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL)
OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
diff --git a/target/mips/sys-available/fon-fon2100 b/target/mips/sys-available/fon-fon2100
index 31ab06045..f0df99dee 100644
--- a/target/mips/sys-available/fon-fon2100
+++ b/target/mips/sys-available/fon-fon2100
@@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_FON_FON2100
select ADK_KERNEL_ATHEROS_AR231X
select ADK_TARGET_WITH_MTD
select ADK_TARGET_WITH_AHB
+ select ADK_TARGET_KERNEL_VMLINUZ
help
Support for FON's FON2100.
diff --git a/target/mips/sys-available/lemote-yeelong b/target/mips/sys-available/lemote-yeelong
index 6700b49e8..10db77945 100644
--- a/target/mips/sys-available/lemote-yeelong
+++ b/target/mips/sys-available/lemote-yeelong
@@ -14,6 +14,7 @@ config ADK_TARGET_SYSTEM_LEMOTE_YEELONG
select ADK_TARGET_WITH_RTC
select ADK_TARGET_WITH_HDD
select ADK_TARGET_WITH_PCI
+ select ADK_TARGET_KERNEL_VMLINUZ
help
System profile for Lemote Yeelong laptop.
diff --git a/target/mips/sys-available/qemu-mips b/target/mips/sys-available/qemu-mips
index d806d9c78..612bb2a33 100644
--- a/target/mips/sys-available/qemu-mips
+++ b/target/mips/sys-available/qemu-mips
@@ -11,6 +11,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS
select ADK_TARGET_WITH_INPUT
select ADK_TARGET_WITH_PCI
select ADK_TARGET_WITH_HDD
+ select ADK_TARGET_KERNEL_VMLINUZ
help
Qemu support for mips big endian architecture.
diff --git a/target/mips/sys-available/qemu-mips64 b/target/mips/sys-available/qemu-mips64
index 304c07618..48f79f94a 100644
--- a/target/mips/sys-available/qemu-mips64
+++ b/target/mips/sys-available/qemu-mips64
@@ -14,6 +14,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64
select ADK_TARGET_WITH_INPUT
select ADK_TARGET_WITH_PCI
select ADK_TARGET_WITH_HDD
+ select ADK_TARGET_KERNEL_VMLINUZ
help
Qemu support for mips64 big endian architecture.
diff --git a/target/mips/sys-available/qemu-mips64el b/target/mips/sys-available/qemu-mips64el
index 37c6be164..e5fba2317 100644
--- a/target/mips/sys-available/qemu-mips64el
+++ b/target/mips/sys-available/qemu-mips64el
@@ -15,6 +15,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64EL
select ADK_TARGET_WITH_INPUT
select ADK_TARGET_WITH_PCI
select ADK_TARGET_WITH_HDD
+ select ADK_TARGET_KERNEL_VMLINUZ
help
Qemu support for mips64 little endian architecture.
diff --git a/target/mips/sys-available/qemu-mipsel b/target/mips/sys-available/qemu-mipsel
index 918ec223e..4df64031d 100644
--- a/target/mips/sys-available/qemu-mipsel
+++ b/target/mips/sys-available/qemu-mipsel
@@ -11,6 +11,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPSEL
select ADK_TARGET_WITH_INPUT
select ADK_TARGET_WITH_PCI
select ADK_TARGET_WITH_HDD
+ select ADK_TARGET_KERNEL_VMLINUZ
help
Qemu support for mips little endian architecture.
--
cgit v1.2.3