summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-04-06 20:52:49 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-04-06 20:52:49 +0200
commitaa9a46d40ae76b926880ff36b1bb7d27f52b55ac (patch)
tree9e1d8440896375c8a87b16134973864c133ef780 /target
parentfcb8e56cdc4864aa55ae3f377f94f9be3a9fe7c9 (diff)
use one kernel config
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in3
-rw-r--r--target/x86/kernel/qemu-x86 (renamed from target/x86/kernel/qemu-i686)0
2 files changed, 1 insertions, 2 deletions
diff --git a/target/config/Config.in b/target/config/Config.in
index ce1adefac..2bcb4751b 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -202,9 +202,8 @@ config ADK_TARGET_KERNEL_MINICONFIG
default "qemu-sh" if ADK_TARGET_SYSTEM_QEMU_SH4EB
default "qemu-sparc" if ADK_TARGET_SYSTEM_QEMU_SPARC
default "qemu-sparc64" if ADK_TARGET_SYSTEM_QEMU_SPARC64
- default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686
+ default "qemu-x86" if ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_I486
default "qemu-x86_64" if ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SYSTEM_QEMU_X86_64_32 || ADK_TARGET_SYSTEM_QEMU_X86_64_X32
- default "qemu-i486" if ADK_TARGET_SYSTEM_QEMU_I486
default "aranym-m68k" if ADK_TARGET_SYSTEM_ARANYM_M68K
default "ibm-x40" if ADK_TARGET_SYSTEM_IBM_X40
default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I
diff --git a/target/x86/kernel/qemu-i686 b/target/x86/kernel/qemu-x86
index 7eb708745..7eb708745 100644
--- a/target/x86/kernel/qemu-i686
+++ b/target/x86/kernel/qemu-x86