|
 |
d81766 |
From 46cda1f9e443d492efaec421fd4b2f5e8a9cbeb4 Mon Sep 17 00:00:00 2001
|
|
|
d81766 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
Date: Sat, 2 Nov 2013 14:10:17 +0100
|
|
|
d81766 |
Subject: rhel: Revert downstream changes to unused default-configs/*.mak
|
|
|
d81766 |
|
|
|
d81766 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
Message-id: <1383401418-4444-2-git-send-email-armbru@redhat.com>
|
|
|
d81766 |
Patchwork-id: 55268
|
|
|
d81766 |
O-Subject: [PATCH 7.0 qemu-kvm 1/2] rhel: Revert downstream changes to unused default-configs/*.mak
|
|
|
d81766 |
Bugzilla: 1001076
|
|
|
d81766 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
d81766 |
RH-Acked-by: Alex Williamson <alex.williamson@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
Pointless conflict magnets. "Unused" means they don't affect the RHEL
|
|
|
d81766 |
build in any way.
|
|
|
d81766 |
|
|
|
d81766 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
d81766 |
|
|
|
d81766 |
diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak
|
|
|
d81766 |
index 05c2f6e..bc07600 100644
|
|
|
d81766 |
--- a/default-configs/alpha-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/alpha-softmmu.mak
|
|
|
d81766 |
@@ -10,6 +10,7 @@ CONFIG_VGA_PCI=y
|
|
|
d81766 |
CONFIG_VGA_CIRRUS=y
|
|
|
d81766 |
CONFIG_IDE_CORE=y
|
|
|
d81766 |
CONFIG_IDE_QDEV=y
|
|
|
d81766 |
+CONFIG_VMWARE_VGA=y
|
|
|
d81766 |
CONFIG_IDE_CMD646=y
|
|
|
d81766 |
CONFIG_I8259=y
|
|
|
d81766 |
CONFIG_MC146818RTC=y
|
|
|
d81766 |
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
|
|
|
d81766 |
index cbd40ea..8e08841 100644
|
|
|
d81766 |
--- a/default-configs/i386-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/i386-softmmu.mak
|
|
|
d81766 |
@@ -8,8 +8,10 @@ CONFIG_QXL=$(CONFIG_SPICE)
|
|
|
d81766 |
CONFIG_VGA_PCI=y
|
|
|
d81766 |
CONFIG_VGA_ISA=y
|
|
|
d81766 |
CONFIG_VGA_CIRRUS=y
|
|
|
d81766 |
+CONFIG_VMWARE_VGA=y
|
|
|
d81766 |
CONFIG_VMMOUSE=y
|
|
|
d81766 |
CONFIG_SERIAL=y
|
|
|
d81766 |
+CONFIG_PARALLEL=y
|
|
|
d81766 |
CONFIG_I8254=y
|
|
|
d81766 |
CONFIG_PCSPK=y
|
|
|
d81766 |
CONFIG_PCKBD=y
|
|
|
d81766 |
@@ -19,7 +21,10 @@ CONFIG_APM=y
|
|
|
d81766 |
CONFIG_I8257=y
|
|
|
d81766 |
CONFIG_IDE_ISA=y
|
|
|
d81766 |
CONFIG_IDE_PIIX=y
|
|
|
d81766 |
+CONFIG_NE2000_ISA=y
|
|
|
d81766 |
CONFIG_PIIX_PCI=y
|
|
|
d81766 |
+CONFIG_HPET=y
|
|
|
d81766 |
+CONFIG_APPLESMC=y
|
|
|
d81766 |
CONFIG_I8259=y
|
|
|
d81766 |
CONFIG_PFLASH_CFI01=y
|
|
|
d81766 |
CONFIG_TPM_TIS=$(CONFIG_TPM)
|
|
|
d81766 |
diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak
|
|
|
d81766 |
index 5b4816a..71177ef 100644
|
|
|
d81766 |
--- a/default-configs/mips-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/mips-softmmu.mak
|
|
|
d81766 |
@@ -9,7 +9,9 @@ CONFIG_VGA_PCI=y
|
|
|
d81766 |
CONFIG_VGA_ISA=y
|
|
|
d81766 |
CONFIG_VGA_ISA_MM=y
|
|
|
d81766 |
CONFIG_VGA_CIRRUS=y
|
|
|
d81766 |
+CONFIG_VMWARE_VGA=y
|
|
|
d81766 |
CONFIG_SERIAL=y
|
|
|
d81766 |
+CONFIG_PARALLEL=y
|
|
|
d81766 |
CONFIG_I8254=y
|
|
|
d81766 |
CONFIG_PCSPK=y
|
|
|
d81766 |
CONFIG_PCKBD=y
|
|
|
d81766 |
@@ -20,6 +22,7 @@ CONFIG_I8257=y
|
|
|
d81766 |
CONFIG_PIIX4=y
|
|
|
d81766 |
CONFIG_IDE_ISA=y
|
|
|
d81766 |
CONFIG_IDE_PIIX=y
|
|
|
d81766 |
+CONFIG_NE2000_ISA=y
|
|
|
d81766 |
CONFIG_RC4030=y
|
|
|
d81766 |
CONFIG_DP8393X=y
|
|
|
d81766 |
CONFIG_DS1225Y=y
|
|
|
d81766 |
diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak
|
|
|
d81766 |
index 8b02d98..617301b 100644
|
|
|
d81766 |
--- a/default-configs/mips64-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/mips64-softmmu.mak
|
|
|
d81766 |
@@ -9,7 +9,9 @@ CONFIG_VGA_PCI=y
|
|
|
d81766 |
CONFIG_VGA_ISA=y
|
|
|
d81766 |
CONFIG_VGA_ISA_MM=y
|
|
|
d81766 |
CONFIG_VGA_CIRRUS=y
|
|
|
d81766 |
+CONFIG_VMWARE_VGA=y
|
|
|
d81766 |
CONFIG_SERIAL=y
|
|
|
d81766 |
+CONFIG_PARALLEL=y
|
|
|
d81766 |
CONFIG_I8254=y
|
|
|
d81766 |
CONFIG_PCSPK=y
|
|
|
d81766 |
CONFIG_PCKBD=y
|
|
|
d81766 |
@@ -20,6 +22,7 @@ CONFIG_I8257=y
|
|
|
d81766 |
CONFIG_PIIX4=y
|
|
|
d81766 |
CONFIG_IDE_ISA=y
|
|
|
d81766 |
CONFIG_IDE_PIIX=y
|
|
|
d81766 |
+CONFIG_NE2000_ISA=y
|
|
|
d81766 |
CONFIG_RC4030=y
|
|
|
d81766 |
CONFIG_DP8393X=y
|
|
|
d81766 |
CONFIG_DS1225Y=y
|
|
|
d81766 |
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
|
|
|
d81766 |
index 961fa04..317b151 100644
|
|
|
d81766 |
--- a/default-configs/mips64el-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/mips64el-softmmu.mak
|
|
|
d81766 |
@@ -9,7 +9,9 @@ CONFIG_VGA_PCI=y
|
|
|
d81766 |
CONFIG_VGA_ISA=y
|
|
|
d81766 |
CONFIG_VGA_ISA_MM=y
|
|
|
d81766 |
CONFIG_VGA_CIRRUS=y
|
|
|
d81766 |
+CONFIG_VMWARE_VGA=y
|
|
|
d81766 |
CONFIG_SERIAL=y
|
|
|
d81766 |
+CONFIG_PARALLEL=y
|
|
|
d81766 |
CONFIG_I8254=y
|
|
|
d81766 |
CONFIG_PCSPK=y
|
|
|
d81766 |
CONFIG_PCKBD=y
|
|
|
d81766 |
@@ -21,6 +23,7 @@ CONFIG_PIIX4=y
|
|
|
d81766 |
CONFIG_IDE_ISA=y
|
|
|
d81766 |
CONFIG_IDE_PIIX=y
|
|
|
d81766 |
CONFIG_IDE_VIA=y
|
|
|
d81766 |
+CONFIG_NE2000_ISA=y
|
|
|
d81766 |
CONFIG_RC4030=y
|
|
|
d81766 |
CONFIG_DP8393X=y
|
|
|
d81766 |
CONFIG_DS1225Y=y
|
|
|
d81766 |
diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak
|
|
|
d81766 |
index 8715e5c..532a9ae 100644
|
|
|
d81766 |
--- a/default-configs/mipsel-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/mipsel-softmmu.mak
|
|
|
d81766 |
@@ -9,7 +9,9 @@ CONFIG_VGA_PCI=y
|
|
|
d81766 |
CONFIG_VGA_ISA=y
|
|
|
d81766 |
CONFIG_VGA_ISA_MM=y
|
|
|
d81766 |
CONFIG_VGA_CIRRUS=y
|
|
|
d81766 |
+CONFIG_VMWARE_VGA=y
|
|
|
d81766 |
CONFIG_SERIAL=y
|
|
|
d81766 |
+CONFIG_PARALLEL=y
|
|
|
d81766 |
CONFIG_I8254=y
|
|
|
d81766 |
CONFIG_PCSPK=y
|
|
|
d81766 |
CONFIG_PCKBD=y
|
|
|
d81766 |
@@ -20,6 +22,7 @@ CONFIG_I8257=y
|
|
|
d81766 |
CONFIG_PIIX4=y
|
|
|
d81766 |
CONFIG_IDE_ISA=y
|
|
|
d81766 |
CONFIG_IDE_PIIX=y
|
|
|
d81766 |
+CONFIG_NE2000_ISA=y
|
|
|
d81766 |
CONFIG_RC4030=y
|
|
|
d81766 |
CONFIG_DP8393X=y
|
|
|
d81766 |
CONFIG_DS1225Y=y
|
|
|
d81766 |
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
|
|
|
d81766 |
index 50fded0..33f8d84 100644
|
|
|
d81766 |
--- a/default-configs/ppc-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/ppc-softmmu.mak
|
|
|
d81766 |
@@ -9,6 +9,7 @@ CONFIG_M48T59=y
|
|
|
d81766 |
CONFIG_VGA=y
|
|
|
d81766 |
CONFIG_VGA_PCI=y
|
|
|
d81766 |
CONFIG_SERIAL=y
|
|
|
d81766 |
+CONFIG_PARALLEL=y
|
|
|
d81766 |
CONFIG_I8254=y
|
|
|
d81766 |
CONFIG_PCKBD=y
|
|
|
d81766 |
CONFIG_FDC=y
|
|
|
d81766 |
@@ -32,6 +33,7 @@ CONFIG_PPCE500_PCI=y
|
|
|
d81766 |
CONFIG_IDE_ISA=y
|
|
|
d81766 |
CONFIG_IDE_CMD646=y
|
|
|
d81766 |
CONFIG_IDE_MACIO=y
|
|
|
d81766 |
+CONFIG_NE2000_ISA=y
|
|
|
d81766 |
CONFIG_PFLASH_CFI01=y
|
|
|
d81766 |
CONFIG_PFLASH_CFI02=y
|
|
|
d81766 |
CONFIG_PTIMER=y
|
|
|
d81766 |
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
|
|
|
d81766 |
index 758e52b..37a15b7 100644
|
|
|
d81766 |
--- a/default-configs/ppc64-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/ppc64-softmmu.mak
|
|
|
d81766 |
@@ -9,6 +9,7 @@ CONFIG_M48T59=y
|
|
|
d81766 |
CONFIG_VGA=y
|
|
|
d81766 |
CONFIG_VGA_PCI=y
|
|
|
d81766 |
CONFIG_SERIAL=y
|
|
|
d81766 |
+CONFIG_PARALLEL=y
|
|
|
d81766 |
CONFIG_I8254=y
|
|
|
d81766 |
CONFIG_PCKBD=y
|
|
|
d81766 |
CONFIG_FDC=y
|
|
|
d81766 |
@@ -32,6 +33,7 @@ CONFIG_PPCE500_PCI=y
|
|
|
d81766 |
CONFIG_IDE_ISA=y
|
|
|
d81766 |
CONFIG_IDE_CMD646=y
|
|
|
d81766 |
CONFIG_IDE_MACIO=y
|
|
|
d81766 |
+CONFIG_NE2000_ISA=y
|
|
|
d81766 |
CONFIG_PFLASH_CFI01=y
|
|
|
d81766 |
CONFIG_PFLASH_CFI02=y
|
|
|
d81766 |
CONFIG_PTIMER=y
|
|
|
d81766 |
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
|
|
|
d81766 |
index aa2bdb1..fb482d2 100644
|
|
|
d81766 |
--- a/default-configs/ppcemb-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/ppcemb-softmmu.mak
|
|
|
d81766 |
@@ -22,6 +22,7 @@ CONFIG_PPCE500_PCI=y
|
|
|
d81766 |
CONFIG_IDE_ISA=y
|
|
|
d81766 |
CONFIG_IDE_CMD646=y
|
|
|
d81766 |
CONFIG_IDE_MACIO=y
|
|
|
d81766 |
+CONFIG_NE2000_ISA=y
|
|
|
d81766 |
CONFIG_PFLASH_CFI01=y
|
|
|
d81766 |
CONFIG_PFLASH_CFI02=y
|
|
|
d81766 |
CONFIG_PTIMER=y
|
|
|
d81766 |
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
|
|
|
d81766 |
index 775e16a..ab796b3 100644
|
|
|
d81766 |
--- a/default-configs/sparc-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/sparc-softmmu.mak
|
|
|
d81766 |
@@ -7,6 +7,7 @@ CONFIG_M48T59=y
|
|
|
d81766 |
CONFIG_PTIMER=y
|
|
|
d81766 |
CONFIG_FDC=y
|
|
|
d81766 |
CONFIG_EMPTY_SLOT=y
|
|
|
d81766 |
+CONFIG_PCNET_COMMON=y
|
|
|
d81766 |
CONFIG_LANCE=y
|
|
|
d81766 |
CONFIG_TCX=y
|
|
|
d81766 |
CONFIG_CG3=y
|
|
|
d81766 |
diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
|
|
|
d81766 |
index 34c13a4..299c97b 100644
|
|
|
d81766 |
--- a/default-configs/sparc64-softmmu.mak
|
|
|
d81766 |
+++ b/default-configs/sparc64-softmmu.mak
|
|
|
d81766 |
@@ -8,6 +8,7 @@ CONFIG_PTIMER=y
|
|
|
d81766 |
CONFIG_VGA=y
|
|
|
d81766 |
CONFIG_VGA_PCI=y
|
|
|
d81766 |
CONFIG_SERIAL=y
|
|
|
d81766 |
+CONFIG_PARALLEL=y
|
|
|
d81766 |
CONFIG_PCKBD=y
|
|
|
d81766 |
CONFIG_FDC=y
|
|
|
d81766 |
CONFIG_IDE_ISA=y
|