From 1dcee6fbc23e59cd5a2111e74ae4915d56576174 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 31 Oct 2009 17:50:39 +0100 Subject: finetune qemu-cris, add qemu-x86_64 --- target/Config.in | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'target/Config.in') diff --git a/target/Config.in b/target/Config.in index 0afd0af0c..88f0343a0 100644 --- a/target/Config.in +++ b/target/Config.in @@ -26,9 +26,6 @@ config ADK_alix1c config ADK_qemu_arm tristate -config ADK_qemu_x86 - tristate - config ADK_qemu_mips tristate @@ -44,6 +41,12 @@ config ADK_qemu_mips64el config ADK_qemu_cris tristate +config ADK_qemu_x86 + tristate + +config ADK_qemu_x86_64 + tristate + config ADK_rb532 tristate @@ -90,12 +93,13 @@ config ADK_DEVICE string default "alix1c" if ADK_alix1c default "qemu-arm" if ADK_qemu_arm - default "qemu-x86" if ADK_qemu_x86 + default "qemu-cris" if ADK_qemu_cris default "qemu-mips" if ADK_qemu_mips default "qemu-mipsel" if ADK_qemu_mipsel default "qemu-mips64" if ADK_qemu_mips64 default "qemu-mips64el" if ADK_qemu_mips64el - default "qemu-cris" if ADK_qemu_cris + default "qemu-x86" if ADK_qemu_x86 + default "qemu-x86_64" if ADK_qemu_x86_64 default "foxboard" if ADK_foxboard default "native" if ADK_NATIVE default "rb532" if ADK_rb532 @@ -282,14 +286,6 @@ config ADK_LINUX_ARM_QEMU Qemu support for ARM architecture. Right now this is optimized for Zaurus PDA spitz. -config ADK_LINUX_X86_QEMU - bool "x86" - select ADK_qemu_x86 - select ADK_KPACKAGE_KMOD_NE2K_PCI - select ADK_KERNEL_INPUT_KEYBOARD - help - Qemu support for x86 architecture. - config ADK_LINUX_MIPS_QEMU bool "mips (big endian)" select ADK_qemu_mips @@ -323,6 +319,22 @@ config ADK_LINUX_CRIS_QEMU help Qemu support for CRISv32 architecture. +config ADK_LINUX_X86_QEMU + bool "x86" + select ADK_qemu_x86 + select ADK_KPACKAGE_KMOD_NE2K_PCI + select ADK_KERNEL_INPUT_KEYBOARD + help + Qemu support for x86 architecture. + +config ADK_LINUX_X86_64_QEMU + bool "x86_64" + select ADK_qemu_x86_64 + select ADK_KPACKAGE_KMOD_NE2K_PCI + select ADK_KERNEL_INPUT_KEYBOARD + help + Qemu support for x86_64 architecture. + endchoice choice @@ -446,13 +458,7 @@ prompt "Target Firmware type" config ADK_TARGET_ROOTFS_INITRAMFS bool "initramfs filesystem" - depends on ADK_LINUX_X86_QEMU || \ - ADK_LINUX_ARM_QEMU || \ - ADK_LINUX_CRIS_QEMU || \ - ADK_LINUX_MIPS_QEMU || \ - ADK_LINUX_MIPSEL_QEMU || \ - ADK_LINUX_MIPS64_QEMU || \ - ADK_LINUX_MIPS64EL_QEMU || \ + depends on ADK_LINUX_QEMU || \ ADK_LINUX_NATIVE || \ ADK_LINUX_RESCUE select ADK_KERNEL_BLK_DEV_INITRD @@ -462,13 +468,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK bool "initramfs filesystem included into kernel image" select ADK_LINUX_INITRAMFS_BUILTIN - depends on ADK_LINUX_X86_QEMU || \ - ADK_LINUX_ARM_QEMU || \ - ADK_LINUX_CRIS_QEMU || \ - ADK_LINUX_MIPS_QEMU || \ - ADK_LINUX_MIPSEL_QEMU || \ - ADK_LINUX_MIPS64_QEMU || \ - ADK_LINUX_MIPS64EL_QEMU || \ + depends on ADK_LINUX_QEMU || \ ADK_LINUX_X86_64_SHUTTLE || \ ADK_LINUX_NATIVE || \ ADK_LINUX_RESCUE -- cgit v1.2.3