diff --git a/tools/packaging/qemu/default-configs/aarch64-softmmu.mak b/tools/packaging/qemu/default-configs/aarch64-softmmu.mak
deleted file mode 100644
index 8cbe94362f37..000000000000
--- a/tools/packaging/qemu/default-configs/aarch64-softmmu.mak
+++ /dev/null
@@ -1,159 +0,0 @@
-# Default configuration for aarch64-softmmu
-
-# We support all the 32 bit boards so need all their config
-include arm-softmmu.mak
-
-CONFIG_AUX=y
-CONFIG_DDC=y
-CONFIG_DPCD=y
-CONFIG_XLNX_ZYNQMP=y
-CONFIG_XLNX_ZYNQMP_ARM=y
-CONFIG_XLNX_VERSAL=y
-CONFIG_SBSA_REF=y
-CONFIG_ARM_SMMUV3=y
-CONFIG_MEM_DEVICE=y
-CONFIG_DIMM=y
-
-# Below is borrowed from i386-softmmu.mak of Kata
-# VM port
-CONFIG_VMMOUSE=n
-CONFIG_VMPORT=n
-
-# VMWARE
-CONFIG_VMW_PVSCSI_SCSI_PCI=n
-CONFIG_VMXNET3_PCI=n
-
-# Audio and sound cards
-CONFIG_AC97=n
-CONFIG_ADLIB=n
-CONFIG_CS4231A=n
-CONFIG_ES1370=n
-CONFIG_GUS=n
-CONFIG_HDA=n
-CONFIG_SB16=n
-CONFIG_SD=n
-
-# Automotive
-CONFIG_CAN_BUS=n
-CONFIG_CAN_PCI=n
-CONFIG_CAN_SJA1000=n
-
-# Network
-CONFIG_E1000_PCI=n
-CONFIG_E1000E_PCI_EXPRESS=n
-CONFIG_EEPRO100_PCI=n
-CONFIG_NE2000_COMMON=n
-CONFIG_NE2000_ISA=n
-CONFIG_NE2000_PCI=n
-CONFIG_PCNET_COMMON=n
-CONFIG_PCNET_PCI=n
-CONFIG_ROCKER=n
-CONFIG_RTL8139_PCI=n
-
-# USB
-CONFIG_USB=n
-CONFIG_USB_AUDIO=n
-CONFIG_USB_BLUETOOTH=n
-CONFIG_USB_EHCI=n
-CONFIG_USB_EHCI_PCI=n
-CONFIG_USB_NETWORK=n
-CONFIG_USB_OHCI=n
-CONFIG_USB_OHCI_PCI=n
-CONFIG_USB_SERIAL=n
-CONFIG_USB_SMARTCARD=n
-CONFIG_USB_STORAGE_BOT=n
-CONFIG_USB_STORAGE_MTP=n
-CONFIG_USB_STORAGE_UAS=n
-CONFIG_USB_TABLET_WACOM=n
-CONFIG_USB_UHCI=n
-CONFIG_USB_XHCI=n
-CONFIG_USB_XHCI_NEC=n
-
-# ISA
-CONFIG_IDE_ISA=n
-CONFIG_ISA_DEBUG=n
-CONFIG_ISA_IPMI_BT=n
-CONFIG_ISA_IPMI_KCS=n
-
-# VGA
-CONFIG_ATI_VGA=n
-CONFIG_VGA=n
-CONFIG_VGA_CIRRUS=n
-CONFIG_VGA_ISA=n
-CONFIG_VGA_PCI=n
-CONFIG_VHOST_USER_VGA=n
-CONFIG_VIRTIO_VGA=n
-CONFIG_VMWARE_VGA=n
-
-# Displays
-CONFIG_BOCHS_DISPLAY=n
-CONFIG_DDC=n
-CONFIG_QXL=n
-
-# Graphics
-CONFIG_OPENGL=n
-CONFIG_SPICE=n
-CONFIG_X11=n
-
-# test devices
-CONFIG_HYPERV_TESTDEV=n
-CONFIG_ISA_TESTDEV=n
-CONFIG_PCI_TESTDEV=n
-
-# XEN
-CONFIG_XEN=n
-
-# PCIe
-CONFIG_XIO3130=n
-
-# SCSI
-CONFIG_ESP=n
-CONFIG_ESP_PCI=n
-CONFIG_LSI_SCSI_PCI=n
-CONFIG_MEGASAS_SCSI_PCI=n
-CONFIG_MPTSAS_SCSI_PCI=n
-
-# i2c
-CONFIG_BITBANG_I2C=n
-
-# UART
-CONFIG_SERIAL_PCI_MULTI=n
-
-# PCI
-CONFIG_EDU=n
-CONFIG_I82801B11=n
-CONFIG_IOH3420=n
-CONFIG_IPACK=n
-CONFIG_PXB=n
-
-# SD
-CONFIG_SDHCI=n
-CONFIG_SDHCI_PCI=n
-
-# watchdog
-CONFIG_WDT_IB6300ESB=n
-CONFIG_WDT_IB700=n
-
-# Apple
-CONFIG_APPLESMC=n
-
-# Timer
-CONFIG_HPET=n
-
-# IPMI
-CONFIG_IPMI=n
-CONFIG_IPMI_EXTERN=n
-CONFIG_IPMI_LOCAL=n
-
-# misc
-CONFIG_IVSHMEM_DEVICE=n
-CONFIG_PVPANIC=n
-CONFIG_SEV=n
-CONFIG_SGA=n
-
-#vhost
-CONFIG_VHOST_USER_INPUT=n
-
-# TPM
-CONFIG_TPM_CRB=n
-CONFIG_TPM_TIS=n
diff --git a/tools/packaging/qemu/default-configs/arm-softmmu.mak b/tools/packaging/qemu/default-configs/arm-softmmu.mak
deleted file mode 100644
index abf4309ee62e..000000000000
--- a/tools/packaging/qemu/default-configs/arm-softmmu.mak
+++ /dev/null
@@ -1,216 +0,0 @@
-# Default configuration for arm-softmmu
-
-CONFIG_VGA=y
-CONFIG_NAND=y
-CONFIG_ECC=y
-CONFIG_SERIAL=y
-CONFIG_PTIMER=y
-CONFIG_MAX7310=y
-CONFIG_WM8750=y
-CONFIG_TWL92230=y
-CONFIG_TSC2005=y
-CONFIG_LM832X=y
-CONFIG_TMP105=y
-CONFIG_TMP421=y
-CONFIG_PCA9552=y
-CONFIG_STELLARIS=y
-CONFIG_STELLARIS_INPUT=y
-CONFIG_STELLARIS_ENET=y
-CONFIG_SSD0303=y
-CONFIG_SSD0323=y
-CONFIG_DDC=y
-CONFIG_SII9022=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_FTGMAC100=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_VIRTIO_MMIO=y
-
-CONFIG_ARM11MPCORE=y
-CONFIG_A9MPCORE=y
-CONFIG_A15MPCORE=y
-
-CONFIG_ARM_V7M=y
-CONFIG_NETDUINO2=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_I2C=y
-CONFIG_BITBANG_I2C=y
-CONFIG_FRAMEBUFFER=y
-CONFIG_XILINX_SPIPS=y
-CONFIG_ZYNQ_DEVCFG=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_MPS2=y
-CONFIG_MUSCA=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_STM32F2XX_ADC=y
-CONFIG_STM32F2XX_SPI=y
-CONFIG_STM32F205_SOC=y
-CONFIG_NRF51_SOC=y
-
-CONFIG_CMSDK_APB_TIMER=y
-CONFIG_CMSDK_APB_DUALTIMER=y
-CONFIG_CMSDK_APB_UART=y
-CONFIG_CMSDK_APB_WATCHDOG=y
-
-CONFIG_MPS2_FPGAIO=y
-CONFIG_MPS2_SCC=y
-
-CONFIG_TZ_MPC=y
-CONFIG_TZ_MSC=y
-CONFIG_TZ_PPC=y
-CONFIG_ARMSSE=y
-CONFIG_IOTKIT_SECCTL=y
-CONFIG_IOTKIT_SYSCTL=y
-CONFIG_IOTKIT_SYSINFO=y
-CONFIG_ARMSSE_CPUID=y
-
-CONFIG_VERSATILE=y
-CONFIG_VERSATILE_PCI=y
-CONFIG_VERSATILE_I2C=y
-
-CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
-CONFIG_VFIO_PLATFORM=y
-CONFIG_VFIO_XGMAC=y
-CONFIG_VFIO_AMD_XGBE=y
-
-CONFIG_INTEGRATOR=y
-CONFIG_INTEGRATOR_DEBUG=y
-
-CONFIG_ALLWINNER_A10_PIT=y
-CONFIG_ALLWINNER_A10_PIC=y
-CONFIG_ALLWINNER_A10=y
-
-CONFIG_FSL_IMX6=y
-CONFIG_FSL_IMX31=y
-CONFIG_FSL_IMX25=y
-CONFIG_FSL_IMX7=y
-CONFIG_FSL_IMX6UL=y
-
-CONFIG_IMX_I2C=y
-
-CONFIG_PCIE_PORT=y
-CONFIG_XIO3130=y
-CONFIG_IOH3420=y
-CONFIG_I82801B11=y
-CONFIG_ACPI=y
-CONFIG_ARM_VIRT=y
-CONFIG_SMBIOS=y
-CONFIG_ASPEED_SOC=y
-CONFIG_SMBUS_EEPROM=y
-CONFIG_GPIO_KEY=y
-CONFIG_MSF2=y
-CONFIG_FW_CFG_DMA=y
-CONFIG_XILINX_AXI=y
-CONFIG_PCI_EXPRESS_DESIGNWARE=y
-
-CONFIG_STRONGARM=y
-CONFIG_HIGHBANK=y
-CONFIG_MUSICPAL=y
-CONFIG_MEM_DEVICE=y
-CONFIG_DIMM=y
-CONFIG_NVDIMM=y
-CONFIG_ACPI_NVDIMM=y
-
-CONFIG_PCI=y
-# For now, CONFIG_IDE_CORE requires ISA, so we enable it here
-CONFIG_ISA_BUS=y
-CONFIG_VIRTIO_PCI=y
-include virtio.mak
-CONFIG_USB_UHCI=y
-CONFIG_USB_OHCI=y
-CONFIG_USB_EHCI=y
-CONFIG_USB_XHCI=y
-CONFIG_USB_XHCI_NEC=y
-CONFIG_NE2000_PCI=n
-CONFIG_EEPRO100_PCI=n
-CONFIG_PCNET_PCI=n
-CONFIG_PCNET_COMMON=n
-CONFIG_AC97=n
-CONFIG_HDA=y
-CONFIG_ES1370=n
-CONFIG_SCSI=y
-CONFIG_LSI_SCSI_PCI=y
-CONFIG_VMW_PVSCSI_SCSI_PCI=n
-CONFIG_MEGASAS_SCSI_PCI=n
-CONFIG_MPTSAS_SCSI_PCI=n
-CONFIG_RTL8139_PCI=n
-CONFIG_E1000_PCI=n
-CONFIG_E1000E_PCI_EXPRESS=n
-CONFIG_IDE_CORE=y
-CONFIG_IDE_QDEV=y
-CONFIG_IDE_PCI=y
-CONFIG_AHCI=y
-CONFIG_ESP=n
-CONFIG_ESP_PCI=n
-CONFIG_SERIAL_ISA=y
-CONFIG_SERIAL_PCI=y
-CONFIG_CAN_BUS=y
-CONFIG_CAN_SJA1000=y
-CONFIG_CAN_PCI=y
-CONFIG_IPACK=n
-CONFIG_WDT_IB6300ESB=n
-CONFIG_PCI_TESTDEV=n
-CONFIG_NVME_PCI=y
-CONFIG_SD=y
-CONFIG_SDHCI=n
-CONFIG_EDU=n
-CONFIG_VGA_PCI=y
-CONFIG_BOCHS_DISPLAY=n
-CONFIG_IVSHMEM_DEVICE=n
-CONFIG_ROCKER=n
-CONFIG_VFIO=$(CONFIG_LINUX)
-CONFIG_VFIO_PCI=y
-CONFIG_PCI_GENERIC=y
diff --git a/tools/packaging/qemu/default-configs/arm-softmmu.mak.virt b/tools/packaging/qemu/default-configs/arm-softmmu.mak.virt
deleted file mode 100644
index ad8b6716b3c6..000000000000
--- a/tools/packaging/qemu/default-configs/arm-softmmu.mak.virt
+++ /dev/null
@@ -1,216 +0,0 @@
-# Default configuration for arm-softmmu
-
-CONFIG_VGA=y
-CONFIG_NAND=y
-CONFIG_ECC=y
-CONFIG_SERIAL=y
-CONFIG_PTIMER=y
-CONFIG_MAX7310=y
-CONFIG_WM8750=y
-CONFIG_TWL92230=y
-CONFIG_TSC2005=y
-CONFIG_LM832X=y
-CONFIG_TMP105=y
-CONFIG_TMP421=y
-CONFIG_PCA9552=y
-CONFIG_STELLARIS=n
-CONFIG_STELLARIS_INPUT=y
-CONFIG_STELLARIS_ENET=y
-CONFIG_SSD0303=y
-CONFIG_SSD0323=y
-CONFIG_DDC=y
-CONFIG_SII9022=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_FTGMAC100=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_VIRTIO_MMIO=y
-
-CONFIG_ARM11MPCORE=y
-CONFIG_A9MPCORE=y
-CONFIG_A15MPCORE=y
-
-CONFIG_ARM_V7M=y
-CONFIG_NETDUINO2=n
-
-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=n
-CONFIG_PL031=y
-CONFIG_PL041=n
-CONFIG_PL050=n
-CONFIG_PL061=y
-CONFIG_PL080=y
-CONFIG_PL110=n
-CONFIG_PL181=n
-CONFIG_PL190=y
-CONFIG_PL310=y
-CONFIG_PL330=y
-CONFIG_CADENCE=y
-CONFIG_XGMAC=y
-CONFIG_EXYNOS4=n
-CONFIG_PXA2XX=n
-CONFIG_I2C=y
-CONFIG_BITBANG_I2C=y
-CONFIG_FRAMEBUFFER=y
-CONFIG_XILINX_SPIPS=y
-CONFIG_ZYNQ_DEVCFG=y
-
-CONFIG_ARM11SCU=y
-CONFIG_A9SCU=y
-CONFIG_DIGIC=n
-CONFIG_MARVELL_88W8618=y
-CONFIG_OMAP=y
-CONFIG_TSC210X=y
-CONFIG_BLIZZARD=y
-CONFIG_ONENAND=y
-CONFIG_TUSB6010=y
-CONFIG_IMX=y
-CONFIG_MAINSTONE=n
-CONFIG_MPS2=n
-CONFIG_MUSCA=n
-CONFIG_NSERIES=n
-CONFIG_RASPI=n
-CONFIG_REALVIEW=n
-CONFIG_ZAURUS=y
-CONFIG_ZYNQ=n
-CONFIG_STM32F2XX_TIMER=y
-CONFIG_STM32F2XX_USART=y
-CONFIG_STM32F2XX_SYSCFG=y
-CONFIG_STM32F2XX_ADC=y
-CONFIG_STM32F2XX_SPI=y
-CONFIG_STM32F205_SOC=n
-CONFIG_NRF51_SOC=n
-
-CONFIG_CMSDK_APB_TIMER=y
-CONFIG_CMSDK_APB_DUALTIMER=y
-CONFIG_CMSDK_APB_UART=y
-CONFIG_CMSDK_APB_WATCHDOG=y
-
-CONFIG_MPS2_FPGAIO=y
-CONFIG_MPS2_SCC=y
-
-CONFIG_TZ_MPC=y
-CONFIG_TZ_MSC=y
-CONFIG_TZ_PPC=y
-CONFIG_ARMSSE=y
-CONFIG_IOTKIT_SECCTL=y
-CONFIG_IOTKIT_SYSCTL=y
-CONFIG_IOTKIT_SYSINFO=y
-CONFIG_ARMSSE_CPUID=y
-
-CONFIG_VERSATILE=n
-CONFIG_VERSATILE_PCI=y
-CONFIG_VERSATILE_I2C=y
-
-CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
-CONFIG_VFIO=$(CONFIG_LINUX)
-CONFIG_VFIO_PLATFORM=y
-CONFIG_VFIO_XGMAC=y
-CONFIG_VFIO_AMD_XGBE=y
-
-CONFIG_INTEGRATOR=n
-CONFIG_INTEGRATOR_DEBUG=y
-
-CONFIG_ALLWINNER_A10_PIT=n
-CONFIG_ALLWINNER_A10_PIC=n
-CONFIG_ALLWINNER_A10=n
-
-CONFIG_FSL_IMX6=n
-CONFIG_FSL_IMX31=n
-CONFIG_FSL_IMX25=n
-CONFIG_FSL_IMX7=n
-CONFIG_FSL_IMX6UL=n
-
-CONFIG_IMX_I2C=y
-
-CONFIG_PCIE_PORT=y
-CONFIG_XIO3130=y
-CONFIG_IOH3420=y
-CONFIG_I82801B11=y
-CONFIG_ACPI=y
-CONFIG_ARM_VIRT=y
-CONFIG_SMBIOS=y
-CONFIG_ASPEED_SOC=n
-CONFIG_SMBUS_EEPROM=y
-CONFIG_GPIO_KEY=y
-CONFIG_MSF2=n
-CONFIG_FW_CFG_DMA=y
-CONFIG_XILINX_AXI=y
-CONFIG_PCI_EXPRESS_DESIGNWARE=y
-
-CONFIG_STRONGARM=n
-CONFIG_HIGHBANK=n
-CONFIG_MUSICPAL=n
-CONFIG_MEM_DEVICE=y
-CONFIG_DIMM=y
-CONFIG_NVDIMM=y
-CONFIG_ACPI_NVDIMM=y
-
-CONFIG_PCI=y
-# For now, CONFIG_IDE_CORE requires ISA, so we enable it here
-CONFIG_ISA_BUS=y
-CONFIG_VIRTIO_PCI=y
-include virtio.mak
-CONFIG_USB_UHCI=y
-CONFIG_USB_OHCI=y
-CONFIG_USB_EHCI=y
-CONFIG_USB_XHCI=y
-CONFIG_USB_XHCI_NEC=y
-CONFIG_NE2000_PCI=n
-CONFIG_EEPRO100_PCI=n
-CONFIG_PCNET_PCI=n
-CONFIG_PCNET_COMMON=n
-CONFIG_AC97=n
-CONFIG_HDA=y
-CONFIG_ES1370=n
-CONFIG_SCSI=y
-CONFIG_LSI_SCSI_PCI=y
-CONFIG_VMW_PVSCSI_SCSI_PCI=n
-CONFIG_MEGASAS_SCSI_PCI=n
-CONFIG_MPTSAS_SCSI_PCI=n
-CONFIG_RTL8139_PCI=n
-CONFIG_E1000_PCI=n
-CONFIG_E1000E_PCI_EXPRESS=n
-CONFIG_IDE_CORE=y
-CONFIG_IDE_QDEV=y
-CONFIG_IDE_PCI=y
-CONFIG_AHCI=y
-CONFIG_ESP=n
-CONFIG_ESP_PCI=n
-CONFIG_SERIAL_ISA=y
-CONFIG_SERIAL_PCI=y
-CONFIG_CAN_BUS=y
-CONFIG_CAN_SJA1000=y
-CONFIG_CAN_PCI=y
-CONFIG_IPACK=n
-CONFIG_WDT_IB6300ESB=n
-CONFIG_PCI_TESTDEV=n
-CONFIG_NVME_PCI=y
-CONFIG_SD=y
-CONFIG_SDHCI=n
-CONFIG_EDU=n
-CONFIG_VGA_PCI=y
-CONFIG_BOCHS_DISPLAY=n
-CONFIG_IVSHMEM_DEVICE=n
-CONFIG_ROCKER=n
-CONFIG_VFIO_PCI=y
-CONFIG_PCI_GENERIC=y