summaryrefslogtreecommitdiff
path: root/target/Config.in
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-02-25 21:27:57 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-02-25 21:27:57 +0100
commit4e6e1d325155eff4c61b7590c66feae5d0fe603c (patch)
tree4fe4494d5949648040f7eb6671212f1daabc729c /target/Config.in
parent92de2ee1c2848fe50b9908bb679e0c9edcd4a867 (diff)
update qemu-x86 to 2.6.33
- use e1000 driver by default - no need for dummy qemu.img, phil is right.
Diffstat (limited to 'target/Config.in')
-rw-r--r--target/Config.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/target/Config.in b/target/Config.in
index 249a76605..8c79a505c 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -543,7 +543,7 @@ config ADK_LINUX_CRIS_QEMU
config ADK_LINUX_X86_QEMU
bool "x86"
select ADK_x86_qemu
- select ADK_KPACKAGE_KMOD_8139CP
+ select ADK_KPACKAGE_KMOD_E1000
select ADK_KERNEL_INPUT_KEYBOARD
select ADK_KERNEL_SCSI
select ADK_KERNEL_ATA
@@ -557,7 +557,7 @@ config ADK_LINUX_X86_QEMU
config ADK_LINUX_X86_64_QEMU
bool "x86_64"
select ADK_x86_64_qemu
- select ADK_KPACKAGE_KMOD_8139CP
+ select ADK_KPACKAGE_KMOD_E1000
select ADK_KERNEL_INPUT_KEYBOARD
select ADK_KERNEL_SCSI
select ADK_KERNEL_ATA
@@ -963,6 +963,7 @@ endchoice
choice
prompt "Compression method for Kernel"
depends on ADK_LINUX_QEMU || ADK_LINUX_ALIX
+ depends on !(ADK_TARGET_ROOTFS_INITRAMFS || ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK)
config ADK_TARGET_KERNEL_COMPRESSION_GZIP
boolean