summaryrefslogtreecommitdiffstats
path: root/qemu/default-configs
diff options
context:
space:
mode:
authorRajithaY <rajithax.yerrumsetty@intel.com>2017-04-25 03:31:15 -0700
committerRajitha Yerrumchetty <rajithax.yerrumsetty@intel.com>2017-05-22 06:48:08 +0000
commitbb756eebdac6fd24e8919e2c43f7d2c8c4091f59 (patch)
treeca11e03542edf2d8f631efeca5e1626d211107e3 /qemu/default-configs
parenta14b48d18a9ed03ec191cf16b162206998a895ce (diff)
Adding qemu as a submodule of KVMFORNFV
This Patch includes the changes to add qemu as a submodule to kvmfornfv repo and make use of the updated latest qemu for the execution of all testcase Change-Id: I1280af507a857675c7f81d30c95255635667bdd7 Signed-off-by:RajithaY<rajithax.yerrumsetty@intel.com>
Diffstat (limited to 'qemu/default-configs')
-rw-r--r--qemu/default-configs/aarch64-linux-user.mak1
-rw-r--r--qemu/default-configs/aarch64-softmmu.mak6
-rw-r--r--qemu/default-configs/alpha-linux-user.mak1
-rw-r--r--qemu/default-configs/alpha-softmmu.mak15
-rw-r--r--qemu/default-configs/arm-linux-user.mak1
-rw-r--r--qemu/default-configs/arm-softmmu.mak114
-rw-r--r--qemu/default-configs/armeb-linux-user.mak1
-rw-r--r--qemu/default-configs/cris-linux-user.mak1
-rw-r--r--qemu/default-configs/cris-softmmu.mak6
-rw-r--r--qemu/default-configs/i386-bsd-user.mak1
-rw-r--r--qemu/default-configs/i386-linux-user.mak1
-rw-r--r--qemu/default-configs/i386-softmmu.mak60
-rw-r--r--qemu/default-configs/lm32-softmmu.mak10
-rw-r--r--qemu/default-configs/m68k-linux-user.mak1
-rw-r--r--qemu/default-configs/m68k-softmmu.mak6
-rw-r--r--qemu/default-configs/microblaze-linux-user.mak1
-rw-r--r--qemu/default-configs/microblaze-softmmu.mak11
-rw-r--r--qemu/default-configs/microblazeel-linux-user.mak1
-rw-r--r--qemu/default-configs/microblazeel-softmmu.mak3
-rw-r--r--qemu/default-configs/mips-linux-user.mak1
-rw-r--r--qemu/default-configs/mips-softmmu-common.mak34
-rw-r--r--qemu/default-configs/mips-softmmu.mak3
-rw-r--r--qemu/default-configs/mips64-linux-user.mak1
-rw-r--r--qemu/default-configs/mips64-softmmu.mak9
-rw-r--r--qemu/default-configs/mips64el-linux-user.mak1
-rw-r--r--qemu/default-configs/mips64el-softmmu.mak12
-rw-r--r--qemu/default-configs/mipsel-linux-user.mak1
-rw-r--r--qemu/default-configs/mipsel-softmmu.mak3
-rw-r--r--qemu/default-configs/mipsn32-linux-user.mak1
-rw-r--r--qemu/default-configs/mipsn32el-linux-user.mak1
-rw-r--r--qemu/default-configs/moxie-softmmu.mak5
-rw-r--r--qemu/default-configs/or32-linux-user.mak1
-rw-r--r--qemu/default-configs/or32-softmmu.mak4
-rw-r--r--qemu/default-configs/pci.mak40
-rw-r--r--qemu/default-configs/ppc-linux-user.mak2
-rw-r--r--qemu/default-configs/ppc-softmmu.mak50
-rw-r--r--qemu/default-configs/ppc64-linux-user.mak2
-rw-r--r--qemu/default-configs/ppc64-softmmu.mak56
-rw-r--r--qemu/default-configs/ppc64abi32-linux-user.mak2
-rw-r--r--qemu/default-configs/ppc64le-linux-user.mak2
-rw-r--r--qemu/default-configs/ppcemb-softmmu.mak16
-rw-r--r--qemu/default-configs/s390x-linux-user.mak1
-rw-r--r--qemu/default-configs/s390x-softmmu.mak7
-rw-r--r--qemu/default-configs/sh4-linux-user.mak1
-rw-r--r--qemu/default-configs/sh4-softmmu.mak18
-rw-r--r--qemu/default-configs/sh4eb-linux-user.mak1
-rw-r--r--qemu/default-configs/sh4eb-softmmu.mak18
-rw-r--r--qemu/default-configs/sound.mak4
-rw-r--r--qemu/default-configs/sparc-bsd-user.mak1
-rw-r--r--qemu/default-configs/sparc-linux-user.mak1
-rw-r--r--qemu/default-configs/sparc-softmmu.mak19
-rw-r--r--qemu/default-configs/sparc32plus-linux-user.mak1
-rw-r--r--qemu/default-configs/sparc64-bsd-user.mak1
-rw-r--r--qemu/default-configs/sparc64-linux-user.mak1
-rw-r--r--qemu/default-configs/sparc64-softmmu.mak16
-rw-r--r--qemu/default-configs/tilegx-linux-user.mak1
-rw-r--r--qemu/default-configs/tricore-softmmu.mak0
-rw-r--r--qemu/default-configs/unicore32-linux-user.mak1
-rw-r--r--qemu/default-configs/unicore32-softmmu.mak4
-rw-r--r--qemu/default-configs/usb.mak10
-rw-r--r--qemu/default-configs/x86_64-bsd-user.mak1
-rw-r--r--qemu/default-configs/x86_64-linux-user.mak1
-rw-r--r--qemu/default-configs/x86_64-softmmu.mak60
-rw-r--r--qemu/default-configs/xtensa-softmmu.mak5
-rw-r--r--qemu/default-configs/xtensaeb-softmmu.mak5
65 files changed, 0 insertions, 666 deletions
diff --git a/qemu/default-configs/aarch64-linux-user.mak b/qemu/default-configs/aarch64-linux-user.mak
deleted file mode 100644
index 0a5b08a00..000000000
--- a/qemu/default-configs/aarch64-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for aarch64-linux-user
diff --git a/qemu/default-configs/aarch64-softmmu.mak b/qemu/default-configs/aarch64-softmmu.mak
deleted file mode 100644
index 96dd994b3..000000000
--- a/qemu/default-configs/aarch64-softmmu.mak
+++ /dev/null
@@ -1,6 +0,0 @@
-# Default configuration for aarch64-softmmu
-
-# We support all the 32 bit boards so need all their config
-include arm-softmmu.mak
-
-CONFIG_XLNX_ZYNQMP=y
diff --git a/qemu/default-configs/alpha-linux-user.mak b/qemu/default-configs/alpha-linux-user.mak
deleted file mode 100644
index 7956e2989..000000000
--- a/qemu/default-configs/alpha-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for alpha-linux-user
diff --git a/qemu/default-configs/alpha-softmmu.mak b/qemu/default-configs/alpha-softmmu.mak
deleted file mode 100644
index 7f6161eba..000000000
--- a/qemu/default-configs/alpha-softmmu.mak
+++ /dev/null
@@ -1,15 +0,0 @@
-# Default configuration for alpha-softmmu
-
-include pci.mak
-include usb.mak
-CONFIG_SERIAL=y
-CONFIG_I8254=y
-CONFIG_PCKBD=y
-CONFIG_VGA_CIRRUS=y
-CONFIG_IDE_CORE=y
-CONFIG_IDE_QDEV=y
-CONFIG_VMWARE_VGA=y
-CONFIG_IDE_CMD646=y
-CONFIG_I8259=y
-CONFIG_MC146818RTC=y
-CONFIG_ISA_TESTDEV=y
diff --git a/qemu/default-configs/arm-linux-user.mak b/qemu/default-configs/arm-linux-user.mak
deleted file mode 100644
index 413361a02..000000000
--- a/qemu/default-configs/arm-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for arm-linux-user
diff --git a/qemu/default-configs/arm-softmmu.mak b/qemu/default-configs/arm-softmmu.mak
deleted file mode 100644
index c63cdd073..000000000
--- a/qemu/default-configs/arm-softmmu.mak
+++ /dev/null
@@ -1,114 +0,0 @@
-# Default configuration for arm-softmmu
-
-include pci.mak
-include usb.mak
-CONFIG_VGA=y
-CONFIG_ISA_MMIO=y
-CONFIG_NAND=y
-CONFIG_ECC=y
-CONFIG_SERIAL=y
-CONFIG_PTIMER=y
-CONFIG_SD=y
-CONFIG_MAX7310=y
-CONFIG_WM8750=y
-CONFIG_TWL92230=y
-CONFIG_TSC2005=y
-CONFIG_LM832X=y
-CONFIG_TMP105=y
-CONFIG_STELLARIS=y
-CONFIG_STELLARIS_INPUT=y
-CONFIG_STELLARIS_ENET=y
-CONFIG_SSD0303=y
-CONFIG_SSD0323=y
-CONFIG_ADS7846=y
-CONFIG_MAX111X=y
-CONFIG_SSI=y
-CONFIG_SSI_SD=y
-CONFIG_SSI_M25P80=y
-CONFIG_LAN9118=y
-CONFIG_SMC91C111=y
-CONFIG_ALLWINNER_EMAC=y
-CONFIG_IMX_FEC=y
-CONFIG_DS1338=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_PFLASH_CFI02=y
-CONFIG_MICRODRIVE=y
-CONFIG_USB=y
-CONFIG_USB_MUSB=y
-CONFIG_USB_EHCI_SYSBUS=y
-CONFIG_PLATFORM_BUS=y
-
-CONFIG_ARM11MPCORE=y
-CONFIG_A9MPCORE=y
-CONFIG_A15MPCORE=y
-
-CONFIG_ARM_GIC=y
-CONFIG_ARM_GIC_KVM=$(CONFIG_KVM)
-CONFIG_ARM_TIMER=y
-CONFIG_ARM_MPTIMER=y
-CONFIG_A9_GTIMER=y
-CONFIG_PL011=y
-CONFIG_PL022=y
-CONFIG_PL031=y
-CONFIG_PL041=y
-CONFIG_PL050=y
-CONFIG_PL061=y
-CONFIG_PL080=y
-CONFIG_PL110=y
-CONFIG_PL181=y
-CONFIG_PL190=y
-CONFIG_PL310=y
-CONFIG_PL330=y
-CONFIG_CADENCE=y
-CONFIG_XGMAC=y
-CONFIG_EXYNOS4=y
-CONFIG_PXA2XX=y
-CONFIG_BITBANG_I2C=y
-CONFIG_FRAMEBUFFER=y
-CONFIG_XILINX_SPIPS=y
-
-CONFIG_ARM11SCU=y
-CONFIG_A9SCU=y
-CONFIG_DIGIC=y
-CONFIG_MARVELL_88W8618=y
-CONFIG_OMAP=y
-CONFIG_TSC210X=y
-CONFIG_BLIZZARD=y
-CONFIG_ONENAND=y
-CONFIG_TUSB6010=y
-CONFIG_IMX=y
-CONFIG_MAINSTONE=y
-CONFIG_NSERIES=y
-CONFIG_RASPI=y
-CONFIG_REALVIEW=y
-CONFIG_ZAURUS=y
-CONFIG_ZYNQ=y
-CONFIG_STM32F2XX_TIMER=y
-CONFIG_STM32F2XX_USART=y
-CONFIG_STM32F2XX_SYSCFG=y
-CONFIG_STM32F205_SOC=y
-
-CONFIG_VERSATILE_PCI=y
-CONFIG_VERSATILE_I2C=y
-
-CONFIG_PCI_GENERIC=y
-
-CONFIG_SDHCI=y
-CONFIG_INTEGRATOR_DEBUG=y
-
-CONFIG_ALLWINNER_A10_PIT=y
-CONFIG_ALLWINNER_A10_PIC=y
-CONFIG_ALLWINNER_A10=y
-
-CONFIG_FSL_IMX31=y
-CONFIG_FSL_IMX25=y
-
-CONFIG_IMX_I2C=y
-
-CONFIG_XIO3130=y
-CONFIG_IOH3420=y
-CONFIG_I82801B11=y
-CONFIG_ACPI=y
-CONFIG_SMBIOS=y
-CONFIG_ASPEED_SOC=y
-CONFIG_GPIO_KEY=y
diff --git a/qemu/default-configs/armeb-linux-user.mak b/qemu/default-configs/armeb-linux-user.mak
deleted file mode 100644
index bf2ffe703..000000000
--- a/qemu/default-configs/armeb-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for armeb-linux-user
diff --git a/qemu/default-configs/cris-linux-user.mak b/qemu/default-configs/cris-linux-user.mak
deleted file mode 100644
index e3aec7b86..000000000
--- a/qemu/default-configs/cris-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for cris-linux-user
diff --git a/qemu/default-configs/cris-softmmu.mak b/qemu/default-configs/cris-softmmu.mak
deleted file mode 100644
index d970d5015..000000000
--- a/qemu/default-configs/cris-softmmu.mak
+++ /dev/null
@@ -1,6 +0,0 @@
-# Default configuration for cris-softmmu
-
-CONFIG_ETRAXFS=y
-CONFIG_NAND=y
-CONFIG_PTIMER=y
-CONFIG_PFLASH_CFI02=y
diff --git a/qemu/default-configs/i386-bsd-user.mak b/qemu/default-configs/i386-bsd-user.mak
deleted file mode 100644
index af1b31a59..000000000
--- a/qemu/default-configs/i386-bsd-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for i386-bsd-user
diff --git a/qemu/default-configs/i386-linux-user.mak b/qemu/default-configs/i386-linux-user.mak
deleted file mode 100644
index 8657e6862..000000000
--- a/qemu/default-configs/i386-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for i386-linux-user
diff --git a/qemu/default-configs/i386-softmmu.mak b/qemu/default-configs/i386-softmmu.mak
deleted file mode 100644
index b177e5210..000000000
--- a/qemu/default-configs/i386-softmmu.mak
+++ /dev/null
@@ -1,60 +0,0 @@
-# Default configuration for i386-softmmu
-
-include pci.mak
-include sound.mak
-include usb.mak
-CONFIG_QXL=$(CONFIG_SPICE)
-CONFIG_VGA_ISA=y
-CONFIG_VGA_CIRRUS=y
-CONFIG_VMWARE_VGA=y
-CONFIG_VIRTIO_VGA=y
-CONFIG_VMMOUSE=y
-CONFIG_IPMI=y
-CONFIG_IPMI_LOCAL=y
-CONFIG_IPMI_EXTERN=y
-CONFIG_ISA_IPMI_KCS=y
-CONFIG_ISA_IPMI_BT=y
-CONFIG_SERIAL=y
-CONFIG_PARALLEL=y
-CONFIG_I8254=y
-CONFIG_PCSPK=y
-CONFIG_PCKBD=y
-CONFIG_FDC=y
-CONFIG_ACPI=y
-CONFIG_ACPI_X86=y
-CONFIG_ACPI_X86_ICH=y
-CONFIG_ACPI_MEMORY_HOTPLUG=y
-CONFIG_ACPI_CPU_HOTPLUG=y
-CONFIG_APM=y
-CONFIG_I8257=y
-CONFIG_IDE_ISA=y
-CONFIG_IDE_PIIX=y
-CONFIG_NE2000_ISA=y
-CONFIG_PIIX_PCI=y
-CONFIG_HPET=y
-CONFIG_APPLESMC=y
-CONFIG_I8259=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_TPM_TIS=$(CONFIG_TPM)
-CONFIG_MC146818RTC=y
-CONFIG_PAM=y
-CONFIG_PCI_PIIX=y
-CONFIG_WDT_IB700=y
-CONFIG_XEN_I386=$(CONFIG_XEN)
-CONFIG_ISA_DEBUG=y
-CONFIG_ISA_TESTDEV=y
-CONFIG_VMPORT=y
-CONFIG_SGA=y
-CONFIG_LPC_ICH9=y
-CONFIG_PCI_Q35=y
-CONFIG_APIC=y
-CONFIG_IOAPIC=y
-CONFIG_PVPANIC=y
-CONFIG_MEM_HOTPLUG=y
-CONFIG_NVDIMM=y
-CONFIG_ACPI_NVDIMM=y
-CONFIG_XIO3130=y
-CONFIG_IOH3420=y
-CONFIG_I82801B11=y
-CONFIG_SMBIOS=y
-CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
diff --git a/qemu/default-configs/lm32-softmmu.mak b/qemu/default-configs/lm32-softmmu.mak
deleted file mode 100644
index 4889348a1..000000000
--- a/qemu/default-configs/lm32-softmmu.mak
+++ /dev/null
@@ -1,10 +0,0 @@
-# Default configuration for lm32-softmmu
-
-CONFIG_LM32=y
-CONFIG_MILKYMIST=y
-CONFIG_MILKYMIST_TMU2=$(CONFIG_OPENGL)
-CONFIG_FRAMEBUFFER=y
-CONFIG_PTIMER=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_PFLASH_CFI02=y
-CONFIG_SD=y
diff --git a/qemu/default-configs/m68k-linux-user.mak b/qemu/default-configs/m68k-linux-user.mak
deleted file mode 100644
index 06cd5ed7e..000000000
--- a/qemu/default-configs/m68k-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for m68k-linux-user
diff --git a/qemu/default-configs/m68k-softmmu.mak b/qemu/default-configs/m68k-softmmu.mak
deleted file mode 100644
index d9552df07..000000000
--- a/qemu/default-configs/m68k-softmmu.mak
+++ /dev/null
@@ -1,6 +0,0 @@
-# Default configuration for m68k-softmmu
-
-include pci.mak
-include usb.mak
-CONFIG_COLDFIRE=y
-CONFIG_PTIMER=y
diff --git a/qemu/default-configs/microblaze-linux-user.mak b/qemu/default-configs/microblaze-linux-user.mak
deleted file mode 100644
index 566fdc01c..000000000
--- a/qemu/default-configs/microblaze-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for microblaze-linux-user
diff --git a/qemu/default-configs/microblaze-softmmu.mak b/qemu/default-configs/microblaze-softmmu.mak
deleted file mode 100644
index ce2630818..000000000
--- a/qemu/default-configs/microblaze-softmmu.mak
+++ /dev/null
@@ -1,11 +0,0 @@
-# Default configuration for microblaze-softmmu
-
-CONFIG_PTIMER=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_SERIAL=y
-CONFIG_XILINX=y
-CONFIG_XILINX_AXI=y
-CONFIG_XILINX_SPI=y
-CONFIG_XILINX_ETHLITE=y
-CONFIG_SSI=y
-CONFIG_SSI_M25P80=y
diff --git a/qemu/default-configs/microblazeel-linux-user.mak b/qemu/default-configs/microblazeel-linux-user.mak
deleted file mode 100644
index 378c6ddcb..000000000
--- a/qemu/default-configs/microblazeel-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for microblazeel-linux-user
diff --git a/qemu/default-configs/microblazeel-softmmu.mak b/qemu/default-configs/microblazeel-softmmu.mak
deleted file mode 100644
index 2fcf442fc..000000000
--- a/qemu/default-configs/microblazeel-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for microblazeel-softmmu
-
-include microblaze-softmmu.mak
diff --git a/qemu/default-configs/mips-linux-user.mak b/qemu/default-configs/mips-linux-user.mak
deleted file mode 100644
index 31df57021..000000000
--- a/qemu/default-configs/mips-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for mips-linux-user
diff --git a/qemu/default-configs/mips-softmmu-common.mak b/qemu/default-configs/mips-softmmu-common.mak
deleted file mode 100644
index 0394514b9..000000000
--- a/qemu/default-configs/mips-softmmu-common.mak
+++ /dev/null
@@ -1,34 +0,0 @@
-# Common mips*-softmmu CONFIG defines
-
-include pci.mak
-include sound.mak
-include usb.mak
-CONFIG_ESP=y
-CONFIG_VGA_ISA=y
-CONFIG_VGA_ISA_MM=y
-CONFIG_VGA_CIRRUS=y
-CONFIG_VMWARE_VGA=y
-CONFIG_SERIAL=y
-CONFIG_PARALLEL=y
-CONFIG_I8254=y
-CONFIG_PCSPK=y
-CONFIG_PCKBD=y
-CONFIG_FDC=y
-CONFIG_ACPI=y
-CONFIG_ACPI_X86=y
-CONFIG_ACPI_MEMORY_HOTPLUG=y
-CONFIG_ACPI_CPU_HOTPLUG=y
-CONFIG_APM=y
-CONFIG_I8257=y
-CONFIG_PIIX4=y
-CONFIG_IDE_ISA=y
-CONFIG_IDE_PIIX=y
-CONFIG_NE2000_ISA=y
-CONFIG_MIPSNET=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_I8259=y
-CONFIG_MC146818RTC=y
-CONFIG_ISA_TESTDEV=y
-CONFIG_EMPTY_SLOT=y
-CONFIG_MIPS_CPS=y
-CONFIG_MIPS_ITU=y
diff --git a/qemu/default-configs/mips-softmmu.mak b/qemu/default-configs/mips-softmmu.mak
deleted file mode 100644
index 9fede6e00..000000000
--- a/qemu/default-configs/mips-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for mips-softmmu
-
-include mips-softmmu-common.mak
diff --git a/qemu/default-configs/mips64-linux-user.mak b/qemu/default-configs/mips64-linux-user.mak
deleted file mode 100644
index 1598bfcf7..000000000
--- a/qemu/default-configs/mips64-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for mips64-linux-user
diff --git a/qemu/default-configs/mips64-softmmu.mak b/qemu/default-configs/mips64-softmmu.mak
deleted file mode 100644
index bad749667..000000000
--- a/qemu/default-configs/mips64-softmmu.mak
+++ /dev/null
@@ -1,9 +0,0 @@
-# Default configuration for mips64-softmmu
-
-include mips-softmmu-common.mak
-CONFIG_RC4030=y
-CONFIG_DP8393X=y
-CONFIG_DS1225Y=y
-CONFIG_JAZZ=y
-CONFIG_G364FB=y
-CONFIG_JAZZ_LED=y
diff --git a/qemu/default-configs/mips64el-linux-user.mak b/qemu/default-configs/mips64el-linux-user.mak
deleted file mode 100644
index 629f08408..000000000
--- a/qemu/default-configs/mips64el-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for mips64el-linux-user
diff --git a/qemu/default-configs/mips64el-softmmu.mak b/qemu/default-configs/mips64el-softmmu.mak
deleted file mode 100644
index 485e218cf..000000000
--- a/qemu/default-configs/mips64el-softmmu.mak
+++ /dev/null
@@ -1,12 +0,0 @@
-# Default configuration for mips64el-softmmu
-
-include mips-softmmu-common.mak
-CONFIG_IDE_VIA=y
-CONFIG_RC4030=y
-CONFIG_DP8393X=y
-CONFIG_DS1225Y=y
-CONFIG_FULONG=y
-CONFIG_JAZZ=y
-CONFIG_G364FB=y
-CONFIG_JAZZ_LED=y
-CONFIG_VT82C686=y
diff --git a/qemu/default-configs/mipsel-linux-user.mak b/qemu/default-configs/mipsel-linux-user.mak
deleted file mode 100644
index 4d0e4afb6..000000000
--- a/qemu/default-configs/mipsel-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for mipsel-linux-user
diff --git a/qemu/default-configs/mipsel-softmmu.mak b/qemu/default-configs/mipsel-softmmu.mak
deleted file mode 100644
index a7f605948..000000000
--- a/qemu/default-configs/mipsel-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for mipsel-softmmu
-
-include mips-softmmu-common.mak
diff --git a/qemu/default-configs/mipsn32-linux-user.mak b/qemu/default-configs/mipsn32-linux-user.mak
deleted file mode 100644
index 5b9791979..000000000
--- a/qemu/default-configs/mipsn32-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for mipsn32-linux-user
diff --git a/qemu/default-configs/mipsn32el-linux-user.mak b/qemu/default-configs/mipsn32el-linux-user.mak
deleted file mode 100644
index d6367ff98..000000000
--- a/qemu/default-configs/mipsn32el-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for mipsn32el-linux-user
diff --git a/qemu/default-configs/moxie-softmmu.mak b/qemu/default-configs/moxie-softmmu.mak
deleted file mode 100644
index 1a954764f..000000000
--- a/qemu/default-configs/moxie-softmmu.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default configuration for moxie-softmmu
-
-CONFIG_MC146818RTC=y
-CONFIG_SERIAL=y
-CONFIG_VGA=y
diff --git a/qemu/default-configs/or32-linux-user.mak b/qemu/default-configs/or32-linux-user.mak
deleted file mode 100644
index 808c1f9b8..000000000
--- a/qemu/default-configs/or32-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for or32-linux-user
diff --git a/qemu/default-configs/or32-softmmu.mak b/qemu/default-configs/or32-softmmu.mak
deleted file mode 100644
index cce474672..000000000
--- a/qemu/default-configs/or32-softmmu.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default configuration for or32-softmmu
-
-CONFIG_SERIAL=y
-CONFIG_OPENCORES_ETH=y
diff --git a/qemu/default-configs/pci.mak b/qemu/default-configs/pci.mak
deleted file mode 100644
index 9c8bc68c4..000000000
--- a/qemu/default-configs/pci.mak
+++ /dev/null
@@ -1,40 +0,0 @@
-CONFIG_PCI=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO=y
-CONFIG_USB_UHCI=y
-CONFIG_USB_OHCI=y
-CONFIG_USB_EHCI=y
-CONFIG_USB_XHCI=y
-CONFIG_NE2000_PCI=y
-CONFIG_EEPRO100_PCI=y
-CONFIG_PCNET_PCI=y
-CONFIG_PCNET_COMMON=y
-CONFIG_AC97=y
-CONFIG_HDA=y
-CONFIG_ES1370=y
-CONFIG_LSI_SCSI_PCI=y
-CONFIG_VMW_PVSCSI_SCSI_PCI=y
-CONFIG_MEGASAS_SCSI_PCI=y
-CONFIG_MPTSAS_SCSI_PCI=y
-CONFIG_RTL8139_PCI=y
-CONFIG_E1000_PCI=y
-CONFIG_VMXNET3_PCI=y
-CONFIG_IDE_CORE=y
-CONFIG_IDE_QDEV=y
-CONFIG_IDE_PCI=y
-CONFIG_AHCI=y
-CONFIG_ESP=y
-CONFIG_ESP_PCI=y
-CONFIG_SERIAL=y
-CONFIG_SERIAL_PCI=y
-CONFIG_IPACK=y
-CONFIG_WDT_IB6300ESB=y
-CONFIG_PCI_TESTDEV=y
-CONFIG_NVME_PCI=y
-CONFIG_SD=y
-CONFIG_SDHCI=y
-CONFIG_EDU=y
-CONFIG_VGA=y
-CONFIG_VGA_PCI=y
-CONFIG_IVSHMEM=$(CONFIG_EVENTFD)
-CONFIG_ROCKER=y
diff --git a/qemu/default-configs/ppc-linux-user.mak b/qemu/default-configs/ppc-linux-user.mak
deleted file mode 100644
index 260ba4183..000000000
--- a/qemu/default-configs/ppc-linux-user.mak
+++ /dev/null
@@ -1,2 +0,0 @@
-# Default configuration for ppc-linux-user
-CONFIG_LIBDECNUMBER=y
diff --git a/qemu/default-configs/ppc-softmmu.mak b/qemu/default-configs/ppc-softmmu.mak
deleted file mode 100644
index 4befde3c7..000000000
--- a/qemu/default-configs/ppc-softmmu.mak
+++ /dev/null
@@ -1,50 +0,0 @@
-# Default configuration for ppc-softmmu
-
-include pci.mak
-include sound.mak
-include usb.mak
-CONFIG_ISA_MMIO=y
-CONFIG_ESCC=y
-CONFIG_M48T59=y
-CONFIG_SERIAL=y
-CONFIG_PARALLEL=y
-CONFIG_I8254=y
-CONFIG_PCKBD=y
-CONFIG_FDC=y
-CONFIG_I8257=y
-CONFIG_I82374=y
-CONFIG_OPENPIC=y
-CONFIG_PREP_PCI=y
-CONFIG_I82378=y
-CONFIG_PC87312=y
-CONFIG_MACIO=y
-CONFIG_PCSPK=y
-CONFIG_CUDA=y
-CONFIG_ADB=y
-CONFIG_MAC_NVRAM=y
-CONFIG_MAC_DBDMA=y
-CONFIG_HEATHROW_PIC=y
-CONFIG_GRACKLE_PCI=y
-CONFIG_UNIN_PCI=y
-CONFIG_DEC_PCI=y
-CONFIG_PPCE500_PCI=y
-CONFIG_IDE_ISA=y
-CONFIG_IDE_CMD646=y
-CONFIG_IDE_MACIO=y
-CONFIG_NE2000_ISA=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_PFLASH_CFI02=y
-CONFIG_PTIMER=y
-CONFIG_I8259=y
-CONFIG_XILINX=y
-CONFIG_XILINX_ETHLITE=y
-CONFIG_PREP=y
-CONFIG_MAC=y
-CONFIG_E500=y
-CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
-CONFIG_PLATFORM_BUS=y
-CONFIG_ETSEC=y
-CONFIG_LIBDECNUMBER=y
-# For PReP
-CONFIG_MC146818RTC=y
-CONFIG_ISA_TESTDEV=y
diff --git a/qemu/default-configs/ppc64-linux-user.mak b/qemu/default-configs/ppc64-linux-user.mak
deleted file mode 100644
index e731ce016..000000000
--- a/qemu/default-configs/ppc64-linux-user.mak
+++ /dev/null
@@ -1,2 +0,0 @@
-# Default configuration for ppc64-linux-user
-CONFIG_LIBDECNUMBER=y
diff --git a/qemu/default-configs/ppc64-softmmu.mak b/qemu/default-configs/ppc64-softmmu.mak
deleted file mode 100644
index bb71b23ee..000000000
--- a/qemu/default-configs/ppc64-softmmu.mak
+++ /dev/null
@@ -1,56 +0,0 @@
-# Default configuration for ppc64-softmmu
-
-include pci.mak
-include sound.mak
-include usb.mak
-CONFIG_VIRTIO_VGA=y
-CONFIG_ISA_MMIO=y
-CONFIG_ESCC=y
-CONFIG_M48T59=y
-CONFIG_SERIAL=y
-CONFIG_PARALLEL=y
-CONFIG_I8254=y
-CONFIG_PCKBD=y
-CONFIG_FDC=y
-CONFIG_I8257=y
-CONFIG_I82374=y
-CONFIG_OPENPIC=y
-CONFIG_PREP_PCI=y
-CONFIG_I82378=y
-CONFIG_PC87312=y
-CONFIG_MACIO=y
-CONFIG_PCSPK=y
-CONFIG_CUDA=y
-CONFIG_ADB=y
-CONFIG_MAC_NVRAM=y
-CONFIG_MAC_DBDMA=y
-CONFIG_HEATHROW_PIC=y
-CONFIG_GRACKLE_PCI=y
-CONFIG_UNIN_PCI=y
-CONFIG_DEC_PCI=y
-CONFIG_PPCE500_PCI=y
-CONFIG_IDE_ISA=y
-CONFIG_IDE_CMD646=y
-CONFIG_IDE_MACIO=y
-CONFIG_NE2000_ISA=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_PFLASH_CFI02=y
-CONFIG_PTIMER=y
-CONFIG_I8259=y
-CONFIG_XILINX=y
-CONFIG_XILINX_ETHLITE=y
-CONFIG_PSERIES=y
-CONFIG_PREP=y
-CONFIG_MAC=y
-CONFIG_E500=y
-CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
-CONFIG_PLATFORM_BUS=y
-CONFIG_ETSEC=y
-CONFIG_LIBDECNUMBER=y
-# For pSeries
-CONFIG_XICS=$(CONFIG_PSERIES)
-CONFIG_XICS_KVM=$(and $(CONFIG_PSERIES),$(CONFIG_KVM))
-# For PReP
-CONFIG_MC146818RTC=y
-CONFIG_ISA_TESTDEV=y
-CONFIG_MEM_HOTPLUG=y
diff --git a/qemu/default-configs/ppc64abi32-linux-user.mak b/qemu/default-configs/ppc64abi32-linux-user.mak
deleted file mode 100644
index c244d07d5..000000000
--- a/qemu/default-configs/ppc64abi32-linux-user.mak
+++ /dev/null
@@ -1,2 +0,0 @@
-# Default configuration for ppc64abi32-linux-user
-CONFIG_LIBDECNUMBER=y
diff --git a/qemu/default-configs/ppc64le-linux-user.mak b/qemu/default-configs/ppc64le-linux-user.mak
deleted file mode 100644
index 4ba4eae6c..000000000
--- a/qemu/default-configs/ppc64le-linux-user.mak
+++ /dev/null
@@ -1,2 +0,0 @@
-# Default configuration for ppc64le-linux-user
-CONFIG_LIBDECNUMBER=y
diff --git a/qemu/default-configs/ppcemb-softmmu.mak b/qemu/default-configs/ppcemb-softmmu.mak
deleted file mode 100644
index 54acc4d58..000000000
--- a/qemu/default-configs/ppcemb-softmmu.mak
+++ /dev/null
@@ -1,16 +0,0 @@
-# Default configuration for ppcemb-softmmu
-
-include pci.mak
-include sound.mak
-include usb.mak
-CONFIG_M48T59=y
-CONFIG_SERIAL=y
-CONFIG_I8257=y
-CONFIG_OPENPIC=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_PFLASH_CFI02=y
-CONFIG_PTIMER=y
-CONFIG_I8259=y
-CONFIG_XILINX=y
-CONFIG_XILINX_ETHLITE=y
-CONFIG_LIBDECNUMBER=y
diff --git a/qemu/default-configs/s390x-linux-user.mak b/qemu/default-configs/s390x-linux-user.mak
deleted file mode 100644
index a243c9987..000000000
--- a/qemu/default-configs/s390x-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for s390x-linux-user
diff --git a/qemu/default-configs/s390x-softmmu.mak b/qemu/default-configs/s390x-softmmu.mak
deleted file mode 100644
index 36e15de33..000000000
--- a/qemu/default-configs/s390x-softmmu.mak
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG_PCI=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO=y
-CONFIG_SCLPCONSOLE=y
-CONFIG_S390_FLIC=y
-CONFIG_S390_FLIC_KVM=$(CONFIG_KVM)
-CONFIG_WDT_DIAG288=y
diff --git a/qemu/default-configs/sh4-linux-user.mak b/qemu/default-configs/sh4-linux-user.mak
deleted file mode 100644
index a469e19ac..000000000
--- a/qemu/default-configs/sh4-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sh4-linux-user
diff --git a/qemu/default-configs/sh4-softmmu.mak b/qemu/default-configs/sh4-softmmu.mak
deleted file mode 100644
index 8e00390d4..000000000
--- a/qemu/default-configs/sh4-softmmu.mak
+++ /dev/null
@@ -1,18 +0,0 @@
-# Default configuration for sh4-softmmu
-
-include pci.mak
-include usb.mak
-CONFIG_SERIAL=y
-CONFIG_PTIMER=y
-CONFIG_PFLASH_CFI02=y
-CONFIG_SH4=y
-CONFIG_IDE_MMIO=y
-CONFIG_SM501=y
-CONFIG_ISA_TESTDEV=y
-CONFIG_I82378=y
-CONFIG_I8259=y
-CONFIG_I8254=y
-CONFIG_PCSPK=y
-CONFIG_I82374=y
-CONFIG_I8257=y
-CONFIG_MC146818RTC=y
diff --git a/qemu/default-configs/sh4eb-linux-user.mak b/qemu/default-configs/sh4eb-linux-user.mak
deleted file mode 100644
index be08ca100..000000000
--- a/qemu/default-configs/sh4eb-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sh4eb-linux-user
diff --git a/qemu/default-configs/sh4eb-softmmu.mak b/qemu/default-configs/sh4eb-softmmu.mak
deleted file mode 100644
index efdd05842..000000000
--- a/qemu/default-configs/sh4eb-softmmu.mak
+++ /dev/null
@@ -1,18 +0,0 @@
-# Default configuration for sh4eb-softmmu
-
-include pci.mak
-include usb.mak
-CONFIG_SERIAL=y
-CONFIG_PTIMER=y
-CONFIG_PFLASH_CFI02=y
-CONFIG_SH4=y
-CONFIG_IDE_MMIO=y
-CONFIG_SM501=y
-CONFIG_ISA_TESTDEV=y
-CONFIG_I82378=y
-CONFIG_I8259=y
-CONFIG_I8254=y
-CONFIG_PCSPK=y
-CONFIG_I82374=y
-CONFIG_I8257=y
-CONFIG_MC146818RTC=y
diff --git a/qemu/default-configs/sound.mak b/qemu/default-configs/sound.mak
deleted file mode 100644
index 4f22c34b5..000000000
--- a/qemu/default-configs/sound.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-CONFIG_SB16=y
-CONFIG_ADLIB=y
-CONFIG_GUS=y
-CONFIG_CS4231A=y
diff --git a/qemu/default-configs/sparc-bsd-user.mak b/qemu/default-configs/sparc-bsd-user.mak
deleted file mode 100644
index 21e09508d..000000000
--- a/qemu/default-configs/sparc-bsd-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sparc-bsd-user
diff --git a/qemu/default-configs/sparc-linux-user.mak b/qemu/default-configs/sparc-linux-user.mak
deleted file mode 100644
index 9c716d1f9..000000000
--- a/qemu/default-configs/sparc-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sparc-linux-user
diff --git a/qemu/default-configs/sparc-softmmu.mak b/qemu/default-configs/sparc-softmmu.mak
deleted file mode 100644
index ab796b3d4..000000000
--- a/qemu/default-configs/sparc-softmmu.mak
+++ /dev/null
@@ -1,19 +0,0 @@
-# Default configuration for sparc-softmmu
-
-CONFIG_ECC=y
-CONFIG_ESP=y
-CONFIG_ESCC=y
-CONFIG_M48T59=y
-CONFIG_PTIMER=y
-CONFIG_FDC=y
-CONFIG_EMPTY_SLOT=y
-CONFIG_PCNET_COMMON=y
-CONFIG_LANCE=y
-CONFIG_TCX=y
-CONFIG_CG3=y
-CONFIG_SLAVIO=y
-CONFIG_CS4231=y
-CONFIG_GRLIB=y
-CONFIG_STP2000=y
-CONFIG_ECCMEMCTL=y
-CONFIG_SUN4M=y
diff --git a/qemu/default-configs/sparc32plus-linux-user.mak b/qemu/default-configs/sparc32plus-linux-user.mak
deleted file mode 100644
index 432e88011..000000000
--- a/qemu/default-configs/sparc32plus-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sparc32plus-linux-user
diff --git a/qemu/default-configs/sparc64-bsd-user.mak b/qemu/default-configs/sparc64-bsd-user.mak
deleted file mode 100644
index b8b9eea7f..000000000
--- a/qemu/default-configs/sparc64-bsd-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sparc64-bsd-user
diff --git a/qemu/default-configs/sparc64-linux-user.mak b/qemu/default-configs/sparc64-linux-user.mak
deleted file mode 100644
index bf1bdd6aa..000000000
--- a/qemu/default-configs/sparc64-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sparc64-linux-user
diff --git a/qemu/default-configs/sparc64-softmmu.mak b/qemu/default-configs/sparc64-softmmu.mak
deleted file mode 100644
index 123bb993e..000000000
--- a/qemu/default-configs/sparc64-softmmu.mak
+++ /dev/null
@@ -1,16 +0,0 @@
-# Default configuration for sparc64-softmmu
-
-include pci.mak
-include usb.mak
-CONFIG_ISA_MMIO=y
-CONFIG_M48T59=y
-CONFIG_PTIMER=y
-CONFIG_SERIAL=y
-CONFIG_PARALLEL=y
-CONFIG_PCKBD=y
-CONFIG_FDC=y
-CONFIG_IDE_ISA=y
-CONFIG_IDE_CMD646=y
-CONFIG_PCI_APB=y
-CONFIG_MC146818RTC=y
-CONFIG_ISA_TESTDEV=y
diff --git a/qemu/default-configs/tilegx-linux-user.mak b/qemu/default-configs/tilegx-linux-user.mak
deleted file mode 100644
index 3e47493af..000000000
--- a/qemu/default-configs/tilegx-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for tilegx-linux-user
diff --git a/qemu/default-configs/tricore-softmmu.mak b/qemu/default-configs/tricore-softmmu.mak
deleted file mode 100644
index e69de29bb..000000000
--- a/qemu/default-configs/tricore-softmmu.mak
+++ /dev/null
diff --git a/qemu/default-configs/unicore32-linux-user.mak b/qemu/default-configs/unicore32-linux-user.mak
deleted file mode 100644
index 6aafd2149..000000000
--- a/qemu/default-configs/unicore32-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for unicore32-linux-user
diff --git a/qemu/default-configs/unicore32-softmmu.mak b/qemu/default-configs/unicore32-softmmu.mak
deleted file mode 100644
index de38577a3..000000000
--- a/qemu/default-configs/unicore32-softmmu.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default configuration for unicore32-softmmu
-CONFIG_PUV3=y
-CONFIG_PTIMER=y
-CONFIG_PCKBD=y
diff --git a/qemu/default-configs/usb.mak b/qemu/default-configs/usb.mak
deleted file mode 100644
index f4b85684f..000000000
--- a/qemu/default-configs/usb.mak
+++ /dev/null
@@ -1,10 +0,0 @@
-CONFIG_USB=y
-CONFIG_USB_TABLET_WACOM=y
-CONFIG_USB_STORAGE_BOT=y
-CONFIG_USB_STORAGE_UAS=y
-CONFIG_USB_STORAGE_MTP=y
-CONFIG_USB_SMARTCARD=y
-CONFIG_USB_AUDIO=y
-CONFIG_USB_SERIAL=y
-CONFIG_USB_NETWORK=y
-CONFIG_USB_BLUETOOTH=y
diff --git a/qemu/default-configs/x86_64-bsd-user.mak b/qemu/default-configs/x86_64-bsd-user.mak
deleted file mode 100644
index 73e5d34ec..000000000
--- a/qemu/default-configs/x86_64-bsd-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for x86_64-bsd-user
diff --git a/qemu/default-configs/x86_64-linux-user.mak b/qemu/default-configs/x86_64-linux-user.mak
deleted file mode 100644
index bec1d9e7c..000000000
--- a/qemu/default-configs/x86_64-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for x86_64-linux-user
diff --git a/qemu/default-configs/x86_64-softmmu.mak b/qemu/default-configs/x86_64-softmmu.mak
deleted file mode 100644
index 6e3b312c5..000000000
--- a/qemu/default-configs/x86_64-softmmu.mak
+++ /dev/null
@@ -1,60 +0,0 @@
-# Default configuration for x86_64-softmmu
-
-include pci.mak
-include sound.mak
-include usb.mak
-CONFIG_QXL=$(CONFIG_SPICE)
-CONFIG_VGA_ISA=y
-CONFIG_VGA_CIRRUS=y
-CONFIG_VMWARE_VGA=y
-CONFIG_VIRTIO_VGA=y
-CONFIG_VMMOUSE=y
-CONFIG_IPMI=y
-CONFIG_IPMI_LOCAL=y
-CONFIG_IPMI_EXTERN=y
-CONFIG_ISA_IPMI_KCS=y
-CONFIG_ISA_IPMI_BT=y
-CONFIG_SERIAL=y
-CONFIG_PARALLEL=y
-CONFIG_I8254=y
-CONFIG_PCSPK=y
-CONFIG_PCKBD=y
-CONFIG_FDC=y
-CONFIG_ACPI=y
-CONFIG_ACPI_X86=y
-CONFIG_ACPI_X86_ICH=y
-CONFIG_ACPI_MEMORY_HOTPLUG=y
-CONFIG_ACPI_CPU_HOTPLUG=y
-CONFIG_APM=y
-CONFIG_I8257=y
-CONFIG_IDE_ISA=y
-CONFIG_IDE_PIIX=y
-CONFIG_NE2000_ISA=y
-CONFIG_PIIX_PCI=y
-CONFIG_HPET=y
-CONFIG_APPLESMC=y
-CONFIG_I8259=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_TPM_TIS=$(CONFIG_TPM)
-CONFIG_MC146818RTC=y
-CONFIG_PAM=y
-CONFIG_PCI_PIIX=y
-CONFIG_WDT_IB700=y
-CONFIG_XEN_I386=$(CONFIG_XEN)
-CONFIG_ISA_DEBUG=y
-CONFIG_ISA_TESTDEV=y
-CONFIG_VMPORT=y
-CONFIG_SGA=y
-CONFIG_LPC_ICH9=y
-CONFIG_PCI_Q35=y
-CONFIG_APIC=y
-CONFIG_IOAPIC=y
-CONFIG_PVPANIC=y
-CONFIG_MEM_HOTPLUG=y
-CONFIG_NVDIMM=y
-CONFIG_ACPI_NVDIMM=y
-CONFIG_XIO3130=y
-CONFIG_IOH3420=y
-CONFIG_I82801B11=y
-CONFIG_SMBIOS=y
-CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
diff --git a/qemu/default-configs/xtensa-softmmu.mak b/qemu/default-configs/xtensa-softmmu.mak
deleted file mode 100644
index 9d8899cde..000000000
--- a/qemu/default-configs/xtensa-softmmu.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default configuration for Xtensa
-
-CONFIG_SERIAL=y
-CONFIG_OPENCORES_ETH=y
-CONFIG_PFLASH_CFI01=y
diff --git a/qemu/default-configs/xtensaeb-softmmu.mak b/qemu/default-configs/xtensaeb-softmmu.mak
deleted file mode 100644
index 9d8899cde..000000000
--- a/qemu/default-configs/xtensaeb-softmmu.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default configuration for Xtensa
-
-CONFIG_SERIAL=y
-CONFIG_OPENCORES_ETH=y
-CONFIG_PFLASH_CFI01=y