From 7789a06d2d3e6a409a880a05c32e8b9677125cca Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Thu, 19 Jan 2017 14:52:30 +0800 Subject: [PATCH] cleanup qemu/default-configs/ --- qemu/Makefile | 1 - qemu/config-all-disas.mak | 1 - qemu/default-configs/aarch64-softmmu.mak | 6 -- qemu/default-configs/alpha-softmmu.mak | 17 ---- qemu/default-configs/arm-softmmu.mak | 90 ------------------- qemu/default-configs/cris-softmmu.mak | 6 -- qemu/default-configs/i386-softmmu.mak | 44 --------- qemu/default-configs/lm32-softmmu.mak | 10 --- qemu/default-configs/m68k-softmmu.mak | 6 -- qemu/default-configs/microblaze-softmmu.mak | 11 --- qemu/default-configs/microblazeel-softmmu.mak | 11 --- qemu/default-configs/mips-softmmu.mak | 36 -------- qemu/default-configs/mips64-softmmu.mak | 36 -------- qemu/default-configs/mips64el-softmmu.mak | 39 -------- qemu/default-configs/mipsel-softmmu.mak | 36 -------- qemu/default-configs/moxie-softmmu.mak | 5 -- qemu/default-configs/or32-softmmu.mak | 4 - qemu/default-configs/pci.mak | 32 ------- qemu/default-configs/ppc-softmmu.mak | 52 ----------- qemu/default-configs/ppc64-softmmu.mak | 62 ------------- qemu/default-configs/ppcemb-softmmu.mak | 19 ---- qemu/default-configs/s390x-softmmu.mak | 4 - qemu/default-configs/sh4-softmmu.mak | 18 ---- qemu/default-configs/sh4eb-softmmu.mak | 18 ---- qemu/default-configs/sound.mak | 4 - qemu/default-configs/sparc-softmmu.mak | 19 ---- qemu/default-configs/sparc64-softmmu.mak | 18 ---- qemu/default-configs/tricore-softmmu.mak | 0 qemu/default-configs/unicore32-softmmu.mak | 4 - qemu/default-configs/usb.mak | 9 -- qemu/default-configs/x86_64-softmmu.mak | 44 --------- qemu/default-configs/xtensa-softmmu.mak | 5 -- qemu/default-configs/xtensaeb-softmmu.mak | 5 -- qemu/hw/intc/Makefile.objs | 2 - 34 files changed, 674 deletions(-) delete mode 100644 qemu/config-all-disas.mak delete mode 100644 qemu/default-configs/alpha-softmmu.mak delete mode 100644 qemu/default-configs/cris-softmmu.mak delete mode 100644 qemu/default-configs/lm32-softmmu.mak delete mode 100644 qemu/default-configs/microblaze-softmmu.mak delete mode 100644 qemu/default-configs/microblazeel-softmmu.mak delete mode 100644 qemu/default-configs/moxie-softmmu.mak delete mode 100644 qemu/default-configs/or32-softmmu.mak delete mode 100644 qemu/default-configs/pci.mak delete mode 100644 qemu/default-configs/s390x-softmmu.mak delete mode 100644 qemu/default-configs/sh4-softmmu.mak delete mode 100644 qemu/default-configs/sh4eb-softmmu.mak delete mode 100644 qemu/default-configs/sound.mak delete mode 100644 qemu/default-configs/tricore-softmmu.mak delete mode 100644 qemu/default-configs/unicore32-softmmu.mak delete mode 100644 qemu/default-configs/usb.mak delete mode 100644 qemu/default-configs/xtensa-softmmu.mak delete mode 100644 qemu/default-configs/xtensaeb-softmmu.mak diff --git a/qemu/Makefile b/qemu/Makefile index 656b523c..b9a8f309 100644 --- a/qemu/Makefile +++ b/qemu/Makefile @@ -23,7 +23,6 @@ CONFIG_SOFTMMU := $(if $(filter %-softmmu,$(TARGET_DIRS)),y) CONFIG_USER_ONLY := $(if $(filter %-user,$(TARGET_DIRS)),y) CONFIG_ALL=y -include config-all-devices.mak --include config-all-disas.mak include $(SRC_PATH)/rules.mak config-host.mak: $(SRC_PATH)/configure diff --git a/qemu/config-all-disas.mak b/qemu/config-all-disas.mak deleted file mode 100644 index ecbfede8..00000000 --- a/qemu/config-all-disas.mak +++ /dev/null @@ -1 +0,0 @@ -# Automatically generated by configure - do not modify diff --git a/qemu/default-configs/aarch64-softmmu.mak b/qemu/default-configs/aarch64-softmmu.mak index 6d3b5c7a..e69de29b 100644 --- a/qemu/default-configs/aarch64-softmmu.mak +++ b/qemu/default-configs/aarch64-softmmu.mak @@ -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 - -# Currently no 64-bit specific config requirements diff --git a/qemu/default-configs/alpha-softmmu.mak b/qemu/default-configs/alpha-softmmu.mak deleted file mode 100644 index bc07600f..00000000 --- a/qemu/default-configs/alpha-softmmu.mak +++ /dev/null @@ -1,17 +0,0 @@ -# Default configuration for alpha-softmmu - -include pci.mak -include usb.mak -CONFIG_SERIAL=y -CONFIG_I8254=y -CONFIG_PCKBD=y -CONFIG_VGA=y -CONFIG_VGA_PCI=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-softmmu.mak b/qemu/default-configs/arm-softmmu.mak index f3513fa1..e69de29b 100644 --- a/qemu/default-configs/arm-softmmu.mak +++ b/qemu/default-configs/arm-softmmu.mak @@ -1,90 +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_DS1338=y -CONFIG_PFLASH_CFI01=y -CONFIG_PFLASH_CFI02=y -CONFIG_MICRODRIVE=y -CONFIG_USB_MUSB=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_VERSATILE_PCI=y -CONFIG_VERSATILE_I2C=y - -CONFIG_SDHCI=y -CONFIG_INTEGRATOR_DEBUG=y - -CONFIG_ALLWINNER_A10_PIT=y -CONFIG_ALLWINNER_A10_PIC=y -CONFIG_ALLWINNER_A10=y diff --git a/qemu/default-configs/cris-softmmu.mak b/qemu/default-configs/cris-softmmu.mak deleted file mode 100644 index d970d501..00000000 --- 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-softmmu.mak b/qemu/default-configs/i386-softmmu.mak index 8e088417..558b60d5 100644 --- a/qemu/default-configs/i386-softmmu.mak +++ b/qemu/default-configs/i386-softmmu.mak @@ -1,47 +1,3 @@ # Default configuration for i386-softmmu -include pci.mak -include sound.mak -include usb.mak -CONFIG_VGA=y -CONFIG_QXL=$(CONFIG_SPICE) -CONFIG_VGA_PCI=y -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_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_PCI_HOTPLUG_OLD=y -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 diff --git a/qemu/default-configs/lm32-softmmu.mak b/qemu/default-configs/lm32-softmmu.mak deleted file mode 100644 index 7df58c88..00000000 --- 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_GLX) -CONFIG_FRAMEBUFFER=y -CONFIG_PTIMER=y -CONFIG_PFLASH_CFI01=y -CONFIG_PFLASH_CFI02=y -CONFIG_SD=y diff --git a/qemu/default-configs/m68k-softmmu.mak b/qemu/default-configs/m68k-softmmu.mak index d9552df0..e69de29b 100644 --- a/qemu/default-configs/m68k-softmmu.mak +++ b/qemu/default-configs/m68k-softmmu.mak @@ -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-softmmu.mak b/qemu/default-configs/microblaze-softmmu.mak deleted file mode 100644 index ce263081..00000000 --- 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-softmmu.mak b/qemu/default-configs/microblazeel-softmmu.mak deleted file mode 100644 index acf22c5b..00000000 --- a/qemu/default-configs/microblazeel-softmmu.mak +++ /dev/null @@ -1,11 +0,0 @@ -# Default configuration for microblazeel-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/mips-softmmu.mak b/qemu/default-configs/mips-softmmu.mak index 2a80b04d..e69de29b 100644 --- a/qemu/default-configs/mips-softmmu.mak +++ b/qemu/default-configs/mips-softmmu.mak @@ -1,36 +0,0 @@ -# Default configuration for mips-softmmu - -include pci.mak -include sound.mak -include usb.mak -CONFIG_ESP=y -CONFIG_VGA=y -CONFIG_VGA_PCI=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_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_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/mips64-softmmu.mak b/qemu/default-configs/mips64-softmmu.mak index f1f933bc..e69de29b 100644 --- a/qemu/default-configs/mips64-softmmu.mak +++ b/qemu/default-configs/mips64-softmmu.mak @@ -1,36 +0,0 @@ -# Default configuration for mips64-softmmu - -include pci.mak -include sound.mak -include usb.mak -CONFIG_ESP=y -CONFIG_VGA=y -CONFIG_VGA_PCI=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_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_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-softmmu.mak b/qemu/default-configs/mips64el-softmmu.mak index 317b1513..e69de29b 100644 --- a/qemu/default-configs/mips64el-softmmu.mak +++ b/qemu/default-configs/mips64el-softmmu.mak @@ -1,39 +0,0 @@ -# Default configuration for mips64el-softmmu - -include pci.mak -include sound.mak -include usb.mak -CONFIG_ESP=y -CONFIG_VGA=y -CONFIG_VGA_PCI=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_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_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-softmmu.mak b/qemu/default-configs/mipsel-softmmu.mak index 7708185f..e69de29b 100644 --- a/qemu/default-configs/mipsel-softmmu.mak +++ b/qemu/default-configs/mipsel-softmmu.mak @@ -1,36 +0,0 @@ -# Default configuration for mipsel-softmmu - -include pci.mak -include sound.mak -include usb.mak -CONFIG_ESP=y -CONFIG_VGA=y -CONFIG_VGA_PCI=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_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_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/moxie-softmmu.mak b/qemu/default-configs/moxie-softmmu.mak deleted file mode 100644 index 1a954764..00000000 --- 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-softmmu.mak b/qemu/default-configs/or32-softmmu.mak deleted file mode 100644 index cce47467..00000000 --- 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 91b1e92d..00000000 --- a/qemu/default-configs/pci.mak +++ /dev/null @@ -1,32 +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_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 diff --git a/qemu/default-configs/ppc-softmmu.mak b/qemu/default-configs/ppc-softmmu.mak index d725b233..e69de29b 100644 --- a/qemu/default-configs/ppc-softmmu.mak +++ b/qemu/default-configs/ppc-softmmu.mak @@ -1,52 +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_VGA=y -CONFIG_VGA_PCI=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_OPENPIC=y -CONFIG_PREP=y -CONFIG_MAC=y -CONFIG_E500=y -CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM)) -CONFIG_ETSEC=y -CONFIG_LIBDECNUMBER=y -# For PReP -CONFIG_MC146818RTC=y -CONFIG_ISA_TESTDEV=y diff --git a/qemu/default-configs/ppc64-softmmu.mak b/qemu/default-configs/ppc64-softmmu.mak index bd30d693..e69de29b 100644 --- a/qemu/default-configs/ppc64-softmmu.mak +++ b/qemu/default-configs/ppc64-softmmu.mak @@ -1,62 +0,0 @@ -# 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_VGA=y -CONFIG_VGA_PCI=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_OPENPIC=y -CONFIG_PSERIES=y -CONFIG_PREP=y -CONFIG_MAC=y -CONFIG_E500=y -CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM)) -CONFIG_ETSEC=y -CONFIG_LIBDECNUMBER=y -# For pSeries -CONFIG_XICS=$(CONFIG_PSERIES) -CONFIG_XICS_KVM=$(and $(CONFIG_PSERIES),$(CONFIG_KVM)) -# For PReP -CONFIG_I82378=y -CONFIG_I8259=y -CONFIG_I8254=y -CONFIG_PCSPK=y -CONFIG_I82374=y -CONFIG_I8257=y -CONFIG_MC146818RTC=y -CONFIG_ISA_TESTDEV=y diff --git a/qemu/default-configs/ppcemb-softmmu.mak b/qemu/default-configs/ppcemb-softmmu.mak index e0327614..e69de29b 100644 --- a/qemu/default-configs/ppcemb-softmmu.mak +++ b/qemu/default-configs/ppcemb-softmmu.mak @@ -1,19 +0,0 @@ -# Default configuration for ppcemb-softmmu - -include pci.mak -include sound.mak -include usb.mak -CONFIG_M48T59=y -CONFIG_VGA=y -CONFIG_VGA_PCI=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_OPENPIC=y -CONFIG_LIBDECNUMBER=y diff --git a/qemu/default-configs/s390x-softmmu.mak b/qemu/default-configs/s390x-softmmu.mak deleted file mode 100644 index 126d88dc..00000000 --- a/qemu/default-configs/s390x-softmmu.mak +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_VIRTIO=y -CONFIG_SCLPCONSOLE=y -CONFIG_S390_FLIC=y -CONFIG_S390_FLIC_KVM=$(CONFIG_KVM) diff --git a/qemu/default-configs/sh4-softmmu.mak b/qemu/default-configs/sh4-softmmu.mak deleted file mode 100644 index 8e00390d..00000000 --- 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-softmmu.mak b/qemu/default-configs/sh4eb-softmmu.mak deleted file mode 100644 index efdd0584..00000000 --- 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 4f22c34b..00000000 --- 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-softmmu.mak b/qemu/default-configs/sparc-softmmu.mak index ab796b3d..e69de29b 100644 --- a/qemu/default-configs/sparc-softmmu.mak +++ b/qemu/default-configs/sparc-softmmu.mak @@ -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/sparc64-softmmu.mak b/qemu/default-configs/sparc64-softmmu.mak index 299c97b7..e69de29b 100644 --- a/qemu/default-configs/sparc64-softmmu.mak +++ b/qemu/default-configs/sparc64-softmmu.mak @@ -1,18 +0,0 @@ -# Default configuration for sparc64-softmmu - -include pci.mak -include usb.mak -CONFIG_ISA_MMIO=y -CONFIG_M48T59=y -CONFIG_PTIMER=y -CONFIG_VGA=y -CONFIG_VGA_PCI=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 deleted file mode 100644 index e69de29b..00000000 diff --git a/qemu/default-configs/unicore32-softmmu.mak b/qemu/default-configs/unicore32-softmmu.mak deleted file mode 100644 index de38577a..00000000 --- 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 73d84895..00000000 --- a/qemu/default-configs/usb.mak +++ /dev/null @@ -1,9 +0,0 @@ -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-softmmu.mak b/qemu/default-configs/x86_64-softmmu.mak index 66557ac5..6826a92a 100644 --- a/qemu/default-configs/x86_64-softmmu.mak +++ b/qemu/default-configs/x86_64-softmmu.mak @@ -1,47 +1,3 @@ # Default configuration for x86_64-softmmu -include pci.mak -include sound.mak -include usb.mak -CONFIG_VGA=y -CONFIG_QXL=$(CONFIG_SPICE) -CONFIG_VGA_PCI=y -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_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_PCI_HOTPLUG_OLD=y -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 diff --git a/qemu/default-configs/xtensa-softmmu.mak b/qemu/default-configs/xtensa-softmmu.mak deleted file mode 100644 index 9d8899cd..00000000 --- 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 9d8899cd..00000000 --- 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 diff --git a/qemu/hw/intc/Makefile.objs b/qemu/hw/intc/Makefile.objs index beaa7bb4..7de05c64 100644 --- a/qemu/hw/intc/Makefile.objs +++ b/qemu/hw/intc/Makefile.objs @@ -1,3 +1 @@ -#common-obj-$(CONFIG_IOAPIC) += ioapic_common.o -#obj-$(CONFIG_IOAPIC) += ioapic.o obj-$(CONFIG_APIC) += apic.o apic_common.o