Add qemu 2.4.0

Change-Id: Ic99cbad4b61f8b127b7dc74d04576c0bcbaaf4f5
Signed-off-by: Yang Zhang <yang.z.zhang@intel.com>

63 files changed, 719 insertions, 0 deletions

diff --git a/qemu/default-configs/aarch64-linux-user.mak b/qemu/default-configs/aarch64-linux-user.mak
new file mode 100644
index 000000000..3df7de5b8
--- /dev/null
+++ b/qemu/default-configs/aarch64-linux-user.mak
@@ -0,0 +1,3 @@
+# Default configuration for aarch64-linux-user
+
+CONFIG_GDBSTUB_XML=y
diff --git a/qemu/default-configs/aarch64-softmmu.mak b/qemu/default-configs/aarch64-softmmu.mak
new file mode 100644
index 000000000..96dd994b3
--- /dev/null
+++ b/qemu/default-configs/aarch64-softmmu.mak
@@ -0,0 +1,6 @@
+# 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
new file mode 100644
index 000000000..7956e2989
--- /dev/null
+++ b/qemu/default-configs/alpha-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for alpha-linux-user
diff --git a/qemu/default-configs/alpha-softmmu.mak b/qemu/default-configs/alpha-softmmu.mak
new file mode 100644
index 000000000..7f6161eba
--- /dev/null
+++ b/qemu/default-configs/alpha-softmmu.mak
@@ -0,0 +1,15 @@
+# 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
new file mode 100644
index 000000000..413361a02
--- /dev/null
+++ b/qemu/default-configs/arm-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for arm-linux-user
diff --git a/qemu/default-configs/arm-softmmu.mak b/qemu/default-configs/arm-softmmu.mak
new file mode 100644
index 000000000..74f1db3a0
--- /dev/null
+++ b/qemu/default-configs/arm-softmmu.mak
@@ -0,0 +1,104 @@
+# 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_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_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_XIO3130=y
+CONFIG_IOH3420=y
+CONFIG_I82801B11=y
+CONFIG_ACPI=y
diff --git a/qemu/default-configs/armeb-linux-user.mak b/qemu/default-configs/armeb-linux-user.mak
new file mode 100644
index 000000000..bf2ffe703
--- /dev/null
+++ b/qemu/default-configs/armeb-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for armeb-linux-user
diff --git a/qemu/default-configs/cris-linux-user.mak b/qemu/default-configs/cris-linux-user.mak
new file mode 100644
index 000000000..e3aec7b86
--- /dev/null
+++ b/qemu/default-configs/cris-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for cris-linux-user
diff --git a/qemu/default-configs/cris-softmmu.mak b/qemu/default-configs/cris-softmmu.mak
new file mode 100644
index 000000000..d970d5015
--- /dev/null
+++ b/qemu/default-configs/cris-softmmu.mak
@@ -0,0 +1,6 @@
+# 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
new file mode 100644
index 000000000..af1b31a59
--- /dev/null
+++ b/qemu/default-configs/i386-bsd-user.mak
@@ -0,0 +1 @@
+# Default configuration for i386-bsd-user
diff --git a/qemu/default-configs/i386-linux-user.mak b/qemu/default-configs/i386-linux-user.mak
new file mode 100644
index 000000000..8657e6862
--- /dev/null
+++ b/qemu/default-configs/i386-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for i386-linux-user
diff --git a/qemu/default-configs/i386-softmmu.mak b/qemu/default-configs/i386-softmmu.mak
new file mode 100644
index 000000000..48b57623f
--- /dev/null
+++ b/qemu/default-configs/i386-softmmu.mak
@@ -0,0 +1,51 @@
+# 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_VMMOUSE=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_ICC_BUS=y
+CONFIG_PVPANIC=y
+CONFIG_MEM_HOTPLUG=y
+CONFIG_XIO3130=y
+CONFIG_IOH3420=y
+CONFIG_I82801B11=y
diff --git a/qemu/default-configs/lm32-softmmu.mak b/qemu/default-configs/lm32-softmmu.mak
new file mode 100644
index 000000000..4889348a1
--- /dev/null
+++ b/qemu/default-configs/lm32-softmmu.mak
@@ -0,0 +1,10 @@
+# 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
new file mode 100644
index 000000000..06cd5ed7e
--- /dev/null
+++ b/qemu/default-configs/m68k-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for m68k-linux-user
diff --git a/qemu/default-configs/m68k-softmmu.mak b/qemu/default-configs/m68k-softmmu.mak
new file mode 100644
index 000000000..d9552df07
--- /dev/null
+++ b/qemu/default-configs/m68k-softmmu.mak
@@ -0,0 +1,6 @@
+# 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
new file mode 100644
index 000000000..566fdc01c
--- /dev/null
+++ b/qemu/default-configs/microblaze-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for microblaze-linux-user
diff --git a/qemu/default-configs/microblaze-softmmu.mak b/qemu/default-configs/microblaze-softmmu.mak
new file mode 100644
index 000000000..ce2630818
--- /dev/null
+++ b/qemu/default-configs/microblaze-softmmu.mak
@@ -0,0 +1,11 @@
+# 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
new file mode 100644
index 000000000..378c6ddcb
--- /dev/null
+++ b/qemu/default-configs/microblazeel-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for microblazeel-linux-user
diff --git a/qemu/default-configs/microblazeel-softmmu.mak b/qemu/default-configs/microblazeel-softmmu.mak
new file mode 100644
index 000000000..2fcf442fc
--- /dev/null
+++ b/qemu/default-configs/microblazeel-softmmu.mak
@@ -0,0 +1,3 @@
+# 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
new file mode 100644
index 000000000..31df57021
--- /dev/null
+++ b/qemu/default-configs/mips-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for mips-linux-user
diff --git a/qemu/default-configs/mips-softmmu.mak b/qemu/default-configs/mips-softmmu.mak
new file mode 100644
index 000000000..44467c37c
--- /dev/null
+++ b/qemu/default-configs/mips-softmmu.mak
@@ -0,0 +1,32 @@
+# Default configuration for mips-softmmu
+
+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
diff --git a/qemu/default-configs/mips64-linux-user.mak b/qemu/default-configs/mips64-linux-user.mak
new file mode 100644
index 000000000..1598bfcf7
--- /dev/null
+++ b/qemu/default-configs/mips64-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for mips64-linux-user
diff --git a/qemu/default-configs/mips64-softmmu.mak b/qemu/default-configs/mips64-softmmu.mak
new file mode 100644
index 000000000..66ed5f94c
--- /dev/null
+++ b/qemu/default-configs/mips64-softmmu.mak
@@ -0,0 +1,38 @@
+# Default configuration for mips64-softmmu
+
+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_RC4030=y
+CONFIG_DP8393X=y
+CONFIG_DS1225Y=y
+CONFIG_MIPSNET=y
+CONFIG_PFLASH_CFI01=y
+CONFIG_JAZZ=y
+CONFIG_G364FB=y
+CONFIG_I8259=y
+CONFIG_JAZZ_LED=y
+CONFIG_MC146818RTC=y
+CONFIG_ISA_TESTDEV=y
+CONFIG_EMPTY_SLOT=y
diff --git a/qemu/default-configs/mips64el-linux-user.mak b/qemu/default-configs/mips64el-linux-user.mak
new file mode 100644
index 000000000..629f08408
--- /dev/null
+++ b/qemu/default-configs/mips64el-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for mips64el-linux-user
diff --git a/qemu/default-configs/mips64el-softmmu.mak b/qemu/default-configs/mips64el-softmmu.mak
new file mode 100644
index 000000000..bfca2b2b7
--- /dev/null
+++ b/qemu/default-configs/mips64el-softmmu.mak
@@ -0,0 +1,41 @@
+# Default configuration for mips64el-softmmu
+
+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_IDE_VIA=y
+CONFIG_NE2000_ISA=y
+CONFIG_RC4030=y
+CONFIG_DP8393X=y
+CONFIG_DS1225Y=y
+CONFIG_MIPSNET=y
+CONFIG_PFLASH_CFI01=y
+CONFIG_FULONG=y
+CONFIG_JAZZ=y
+CONFIG_G364FB=y
+CONFIG_I8259=y
+CONFIG_JAZZ_LED=y
+CONFIG_MC146818RTC=y
+CONFIG_VT82C686=y
+CONFIG_ISA_TESTDEV=y
+CONFIG_EMPTY_SLOT=y
diff --git a/qemu/default-configs/mipsel-linux-user.mak b/qemu/default-configs/mipsel-linux-user.mak
new file mode 100644
index 000000000..4d0e4afb6
--- /dev/null
+++ b/qemu/default-configs/mipsel-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for mipsel-linux-user
diff --git a/qemu/default-configs/mipsel-softmmu.mak b/qemu/default-configs/mipsel-softmmu.mak
new file mode 100644
index 000000000..0162ef024
--- /dev/null
+++ b/qemu/default-configs/mipsel-softmmu.mak
@@ -0,0 +1,32 @@
+# Default configuration for mipsel-softmmu
+
+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
diff --git a/qemu/default-configs/mipsn32-linux-user.mak b/qemu/default-configs/mipsn32-linux-user.mak
new file mode 100644
index 000000000..5b9791979
--- /dev/null
+++ b/qemu/default-configs/mipsn32-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for mipsn32-linux-user
diff --git a/qemu/default-configs/mipsn32el-linux-user.mak b/qemu/default-configs/mipsn32el-linux-user.mak
new file mode 100644
index 000000000..d6367ff98
--- /dev/null
+++ b/qemu/default-configs/mipsn32el-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for mipsn32el-linux-user
diff --git a/qemu/default-configs/moxie-softmmu.mak b/qemu/default-configs/moxie-softmmu.mak
new file mode 100644
index 000000000..1a954764f
--- /dev/null
+++ b/qemu/default-configs/moxie-softmmu.mak
@@ -0,0 +1,5 @@
+# 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
new file mode 100644
index 000000000..808c1f9b8
--- /dev/null
+++ b/qemu/default-configs/or32-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for or32-linux-user
diff --git a/qemu/default-configs/or32-softmmu.mak b/qemu/default-configs/or32-softmmu.mak
new file mode 100644
index 000000000..cce474672
--- /dev/null
+++ b/qemu/default-configs/or32-softmmu.mak
@@ -0,0 +1,4 @@
+# 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
new file mode 100644
index 000000000..7e10903ba
--- /dev/null
+++ b/qemu/default-configs/pci.mak
@@ -0,0 +1,39 @@
+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_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_KVM)
+CONFIG_ROCKER=y
diff --git a/qemu/default-configs/ppc-linux-user.mak b/qemu/default-configs/ppc-linux-user.mak
new file mode 100644
index 000000000..260ba4183
--- /dev/null
+++ b/qemu/default-configs/ppc-linux-user.mak
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 000000000..4befde3c7
--- /dev/null
+++ b/qemu/default-configs/ppc-softmmu.mak
@@ -0,0 +1,50 @@
+# 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
new file mode 100644
index 000000000..e731ce016
--- /dev/null
+++ b/qemu/default-configs/ppc64-linux-user.mak
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 000000000..ab62cc7ff
--- /dev/null
+++ b/qemu/default-configs/ppc64-softmmu.mak
@@ -0,0 +1,54 @@
+# Default configuration for ppc64-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_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
diff --git a/qemu/default-configs/ppc64abi32-linux-user.mak b/qemu/default-configs/ppc64abi32-linux-user.mak
new file mode 100644
index 000000000..c244d07d5
--- /dev/null
+++ b/qemu/default-configs/ppc64abi32-linux-user.mak
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 000000000..4ba4eae6c
--- /dev/null
+++ b/qemu/default-configs/ppc64le-linux-user.mak
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 000000000..54acc4d58
--- /dev/null
+++ b/qemu/default-configs/ppcemb-softmmu.mak
@@ -0,0 +1,16 @@
+# 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
new file mode 100644
index 000000000..a243c9987
--- /dev/null
+++ b/qemu/default-configs/s390x-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for s390x-linux-user
diff --git a/qemu/default-configs/s390x-softmmu.mak b/qemu/default-configs/s390x-softmmu.mak
new file mode 100644
index 000000000..36e15de33
--- /dev/null
+++ b/qemu/default-configs/s390x-softmmu.mak
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 000000000..a469e19ac
--- /dev/null
+++ b/qemu/default-configs/sh4-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for sh4-linux-user
diff --git a/qemu/default-configs/sh4-softmmu.mak b/qemu/default-configs/sh4-softmmu.mak
new file mode 100644
index 000000000..8e00390d4
--- /dev/null
+++ b/qemu/default-configs/sh4-softmmu.mak
@@ -0,0 +1,18 @@
+# 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
new file mode 100644
index 000000000..be08ca100
--- /dev/null
+++ b/qemu/default-configs/sh4eb-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for sh4eb-linux-user
diff --git a/qemu/default-configs/sh4eb-softmmu.mak b/qemu/default-configs/sh4eb-softmmu.mak
new file mode 100644
index 000000000..efdd05842
--- /dev/null
+++ b/qemu/default-configs/sh4eb-softmmu.mak
@@ -0,0 +1,18 @@
+# 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
new file mode 100644
index 000000000..4f22c34b5
--- /dev/null
+++ b/qemu/default-configs/sound.mak
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 000000000..21e09508d
--- /dev/null
+++ b/qemu/default-configs/sparc-bsd-user.mak
@@ -0,0 +1 @@
+# Default configuration for sparc-bsd-user
diff --git a/qemu/default-configs/sparc-linux-user.mak b/qemu/default-configs/sparc-linux-user.mak
new file mode 100644
index 000000000..9c716d1f9
--- /dev/null
+++ b/qemu/default-configs/sparc-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for sparc-linux-user
diff --git a/qemu/default-configs/sparc-softmmu.mak b/qemu/default-configs/sparc-softmmu.mak
new file mode 100644
index 000000000..ab796b3d4
--- /dev/null
+++ b/qemu/default-configs/sparc-softmmu.mak
@@ -0,0 +1,19 @@
+# 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
new file mode 100644
index 000000000..432e88011
--- /dev/null
+++ b/qemu/default-configs/sparc32plus-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for sparc32plus-linux-user
diff --git a/qemu/default-configs/sparc64-bsd-user.mak b/qemu/default-configs/sparc64-bsd-user.mak
new file mode 100644
index 000000000..b8b9eea7f
--- /dev/null
+++ b/qemu/default-configs/sparc64-bsd-user.mak
@@ -0,0 +1 @@
+# Default configuration for sparc64-bsd-user
diff --git a/qemu/default-configs/sparc64-linux-user.mak b/qemu/default-configs/sparc64-linux-user.mak
new file mode 100644
index 000000000..bf1bdd6aa
--- /dev/null
+++ b/qemu/default-configs/sparc64-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for sparc64-linux-user
diff --git a/qemu/default-configs/sparc64-softmmu.mak b/qemu/default-configs/sparc64-softmmu.mak
new file mode 100644
index 000000000..123bb993e
--- /dev/null
+++ b/qemu/default-configs/sparc64-softmmu.mak
@@ -0,0 +1,16 @@
+# 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/tricore-softmmu.mak b/qemu/default-configs/tricore-softmmu.mak
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/qemu/default-configs/tricore-softmmu.mak
diff --git a/qemu/default-configs/unicore32-linux-user.mak b/qemu/default-configs/unicore32-linux-user.mak
new file mode 100644
index 000000000..6aafd2149
--- /dev/null
+++ b/qemu/default-configs/unicore32-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for unicore32-linux-user
diff --git a/qemu/default-configs/unicore32-softmmu.mak b/qemu/default-configs/unicore32-softmmu.mak
new file mode 100644
index 000000000..de38577a3
--- /dev/null
+++ b/qemu/default-configs/unicore32-softmmu.mak
@@ -0,0 +1,4 @@
+# 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
new file mode 100644
index 000000000..f4b85684f
--- /dev/null
+++ b/qemu/default-configs/usb.mak
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 000000000..73e5d34ec
--- /dev/null
+++ b/qemu/default-configs/x86_64-bsd-user.mak
@@ -0,0 +1 @@
+# 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
new file mode 100644
index 000000000..bec1d9e7c
--- /dev/null
+++ b/qemu/default-configs/x86_64-linux-user.mak
@@ -0,0 +1 @@
+# 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
new file mode 100644
index 000000000..4962ed70a
--- /dev/null
+++ b/qemu/default-configs/x86_64-softmmu.mak
@@ -0,0 +1,52 @@
+# 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_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_ICC_BUS=y
+CONFIG_PVPANIC=y
+CONFIG_MEM_HOTPLUG=y
+CONFIG_XIO3130=y
+CONFIG_IOH3420=y
+CONFIG_I82801B11=y
diff --git a/qemu/default-configs/xtensa-softmmu.mak b/qemu/default-configs/xtensa-softmmu.mak
new file mode 100644
index 000000000..9d8899cde
--- /dev/null
+++ b/qemu/default-configs/xtensa-softmmu.mak
@@ -0,0 +1,5 @@
+# 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
new file mode 100644
index 000000000..9d8899cde
--- /dev/null
+++ b/qemu/default-configs/xtensaeb-softmmu.mak
@@ -0,0 +1,5 @@
+# Default configuration for Xtensa
+
+CONFIG_SERIAL=y
+CONFIG_OPENCORES_ETH=y
+CONFIG_PFLASH_CFI01=y