summaryrefslogtreecommitdiff
path: root/target/x86/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/kernel
parente251f8299bf34e329613e68116d47e124192bc84 (diff)
resolve merge conflict
Diffstat (limited to 'target/x86/kernel')
-rw-r--r--target/x86/kernel/generic-pc15
-rw-r--r--target/x86/kernel/ibm-x4012
-rw-r--r--target/x86/kernel/qemu-x867
-rw-r--r--target/x86/kernel/qemu-x86_646
4 files changed, 0 insertions, 40 deletions
diff --git a/target/x86/kernel/generic-pc b/target/x86/kernel/generic-pc
index 8b26b4d30..9c844d2b2 100644
--- a/target/x86/kernel/generic-pc
+++ b/target/x86/kernel/generic-pc
@@ -1,20 +1,5 @@
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_NATSEMI=y
-CONFIG_NET_VENDOR_8390=y
-CONFIG_NE2K_PCI=y
-CONFIG_PCNET32=y
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_RTL8139CP=y
-CONFIG_8139TOO=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E100=y
-CONFIG_E1000=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_ATA=y
diff --git a/target/x86/kernel/ibm-x40 b/target/x86/kernel/ibm-x40
index 816e76ca9..eb53a4fec 100644
--- a/target/x86/kernel/ibm-x40
+++ b/target/x86/kernel/ibm-x40
@@ -5,18 +5,6 @@ CONFIG_CPU_SUP_INTEL=y
CONFIG_NR_CPUS=1
CONFIG_VM86=y
CONFIG_X86_REBOOTFIXUPS=y
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-CONFIG_SATA_PMP=y
-CONFIG_ATA_SFF=y
-CONFIG_ATA_BMDMA=y
-CONFIG_ATA_PIIX=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E1000=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_SERIAL_8250_NR_UARTS=2
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
diff --git a/target/x86/kernel/qemu-x86 b/target/x86/kernel/qemu-x86
index 7eb708745..849852a65 100644
--- a/target/x86/kernel/qemu-x86
+++ b/target/x86/kernel/qemu-x86
@@ -1,11 +1,4 @@
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_64 b/target/x86/kernel/qemu-x86_64
index 7bf96c74c..60ffa8dfd 100644
--- a/target/x86/kernel/qemu-x86_64
+++ b/target/x86/kernel/qemu-x86_64
@@ -1,5 +1,4 @@
CONFIG_X86=y
-CONFIG_64BIT=y
CONFIG_X86_64=y
CONFIG_GENERIC_CPU=y
CONFIG_PROCESSOR_SELECT=y
@@ -8,13 +7,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_ISA_DMA_API=y
CONFIG_AMD_NB=y
CONFIG_IA32_EMULATION=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E1000=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_PNP=y
CONFIG_SERIAL_8250_CONSOLE=y