From aa9a46d40ae76b926880ff36b1bb7d27f52b55ac Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 6 Apr 2014 20:52:49 +0200 Subject: use one kernel config --- target/config/Config.in | 3 +-- target/x86/kernel/qemu-i686 | 11 ----------- target/x86/kernel/qemu-x86 | 11 +++++++++++ 3 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 target/x86/kernel/qemu-i686 create mode 100644 target/x86/kernel/qemu-x86 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-i686 deleted file mode 100644 index 7eb708745..000000000 --- a/target/x86/kernel/qemu-i686 +++ /dev/null @@ -1,11 +0,0 @@ -CONFIG_X86=y -CONFIG_X86_32=y -CONFIG_PCI=y -CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y -CONFIG_PCI_DIRECT=y -CONFIG_PCI_DOMAINS=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E1000=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y diff --git a/target/x86/kernel/qemu-x86 b/target/x86/kernel/qemu-x86 new file mode 100644 index 000000000..7eb708745 --- /dev/null +++ b/target/x86/kernel/qemu-x86 @@ -0,0 +1,11 @@ +CONFIG_X86=y +CONFIG_X86_32=y +CONFIG_PCI=y +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_DOMAINS=y +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E1000=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y -- cgit v1.2.3