summaryrefslogtreecommitdiff
path: root/target/x86_64/kernel
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-13 13:44:08 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-13 13:44:08 +0200
commit05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch)
treee99502f671b83f6898a77b78f88fdc67be8aa251 /target/x86_64/kernel
parente251f8299bf34e329613e68116d47e124192bc84 (diff)
resolve merge conflict
Diffstat (limited to 'target/x86_64/kernel')
-rw-r--r--target/x86_64/kernel/qemu-x86_6412
1 files changed, 1 insertions, 11 deletions
diff --git a/target/x86_64/kernel/qemu-x86_64 b/target/x86_64/kernel/qemu-x86_64
index baad58c81..612bdbcb5 100644
--- a/target/x86_64/kernel/qemu-x86_64
+++ b/target/x86_64/kernel/qemu-x86_64
@@ -1,5 +1,6 @@
CONFIG_X86=y
CONFIG_X86_64=y
+CONFIG_X86_X32=y
CONFIG_GENERIC_CPU=y
CONFIG_PROCESSOR_SELECT=y
CONFIG_CPU_SUP_INTEL=y
@@ -7,19 +8,8 @@ CONFIG_CPU_SUP_AMD=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_MTRR=y
-CONFIG_X86_PAT=y
-CONFIG_PCI=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_LABEL=y
-CONFIG_ISA_DMA_API=y
CONFIG_AMD_NB=y
CONFIG_IA32_EMULATION=y
-CONFIG_X86_X32=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E1000=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_PNP=y
CONFIG_SERIAL_8250_CONSOLE=y