configs: rename default-configs to configs and reorganise

In preparation for offering variation to our build configurations lets
move everything and rename it to default. Common included base configs
are also renamed.

During the cleanup the stale usb.mak and pci.mak references were
removed from MAINTAINERS.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210707131744.26027-5-alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

98 files changed, 0 insertions, 627 deletions

diff --git a/default-configs/devices/aarch64-softmmu.mak b/default-configs/devices/aarch64-softmmu.mak
deleted file mode 100644
index 958b1e08e4..0000000000
--- a/default-configs/devices/aarch64-softmmu.mak
+++ /dev/null
@@ -1,8 +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_ARM=y
-CONFIG_XLNX_VERSAL=y
-CONFIG_SBSA_REF=y
diff --git a/default-configs/devices/alpha-softmmu.mak b/default-configs/devices/alpha-softmmu.mak
deleted file mode 100644
index d186fe8e9b..0000000000
--- a/default-configs/devices/alpha-softmmu.mak
+++ /dev/null
@@ -1,10 +0,0 @@
-# Default configuration for alpha-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_PCI_DEVICES=n
-#CONFIG_TEST_DEVICES=n
-
-# Boards:
-#
-CONFIG_DP264=y
diff --git a/default-configs/devices/arm-softmmu.mak b/default-configs/devices/arm-softmmu.mak
deleted file mode 100644
index 4114aa9e35..0000000000
--- a/default-configs/devices/arm-softmmu.mak
+++ /dev/null
@@ -1,43 +0,0 @@
-# Default configuration for arm-softmmu
-
-# CONFIG_PCI_DEVICES=n
-# CONFIG_TEST_DEVICES=n
-
-CONFIG_ARM_VIRT=y
-CONFIG_CUBIEBOARD=y
-CONFIG_EXYNOS4=y
-CONFIG_HIGHBANK=y
-CONFIG_INTEGRATOR=y
-CONFIG_FSL_IMX31=y
-CONFIG_MUSICPAL=y
-CONFIG_MUSCA=y
-CONFIG_CHEETAH=y
-CONFIG_SX1=y
-CONFIG_NSERIES=y
-CONFIG_STELLARIS=y
-CONFIG_REALVIEW=y
-CONFIG_VERSATILE=y
-CONFIG_VEXPRESS=y
-CONFIG_ZYNQ=y
-CONFIG_MAINSTONE=y
-CONFIG_GUMSTIX=y
-CONFIG_SPITZ=y
-CONFIG_TOSA=y
-CONFIG_Z2=y
-CONFIG_NPCM7XX=y
-CONFIG_COLLIE=y
-CONFIG_ASPEED_SOC=y
-CONFIG_NETDUINO2=y
-CONFIG_NETDUINOPLUS2=y
-CONFIG_MPS2=y
-CONFIG_RASPI=y
-CONFIG_DIGIC=y
-CONFIG_SABRELITE=y
-CONFIG_EMCRAFT_SF2=y
-CONFIG_MICROBIT=y
-CONFIG_FSL_IMX25=y
-CONFIG_FSL_IMX7=y
-CONFIG_FSL_IMX6UL=y
-CONFIG_SEMIHOSTING=y
-CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
-CONFIG_ALLWINNER_H3=y
diff --git a/default-configs/devices/avr-softmmu.mak b/default-configs/devices/avr-softmmu.mak
deleted file mode 100644
index 80218add98..0000000000
--- a/default-configs/devices/avr-softmmu.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default configuration for avr-softmmu
-
-# Boards:
-#
-CONFIG_ARDUINO=y
diff --git a/default-configs/devices/cris-softmmu.mak b/default-configs/devices/cris-softmmu.mak
deleted file mode 100644
index 5932cf4d06..0000000000
--- a/default-configs/devices/cris-softmmu.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default configuration for cris-softmmu
-
-# Boards:
-#
-CONFIG_AXIS=y
diff --git a/default-configs/devices/hppa-softmmu.mak b/default-configs/devices/hppa-softmmu.mak
deleted file mode 100644
index b64c5eb3ff..0000000000
--- a/default-configs/devices/hppa-softmmu.mak
+++ /dev/null
@@ -1,9 +0,0 @@
-# Default configuration for hppa-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_PCI_DEVICES=n
-
-# Boards:
-#
-CONFIG_DINO=y
diff --git a/default-configs/devices/i386-softmmu.mak b/default-configs/devices/i386-softmmu.mak
deleted file mode 100644
index 84d1a2487c..0000000000
--- a/default-configs/devices/i386-softmmu.mak
+++ /dev/null
@@ -1,31 +0,0 @@
-# Default configuration for i386-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_AMD_IOMMU=n
-#CONFIG_APPLESMC=n
-#CONFIG_FDC=n
-#CONFIG_HPET=n
-#CONFIG_HYPERV=n
-#CONFIG_ISA_DEBUG=n
-#CONFIG_ISA_IPMI_BT=n
-#CONFIG_ISA_IPMI_KCS=n
-#CONFIG_PCI_IPMI_KCS=n
-#CONFIG_PCI_IPMI_BT=n
-#CONFIG_IPMI_SSIF=n
-#CONFIG_PCI_DEVICES=n
-#CONFIG_PVPANIC=n
-#CONFIG_QXL=n
-#CONFIG_SEV=n
-#CONFIG_SGA=n
-#CONFIG_TEST_DEVICES=n
-#CONFIG_TPM_CRB=n
-#CONFIG_TPM_TIS_ISA=n
-#CONFIG_VTD=n
-
-# Boards:
-#
-CONFIG_ISAPC=y
-CONFIG_I440FX=y
-CONFIG_Q35=y
-CONFIG_MICROVM=y
diff --git a/default-configs/devices/m68k-softmmu.mak b/default-configs/devices/m68k-softmmu.mak
deleted file mode 100644
index 7f8619e427..0000000000
--- a/default-configs/devices/m68k-softmmu.mak
+++ /dev/null
@@ -1,11 +0,0 @@
-# Default configuration for m68k-softmmu
-
-CONFIG_SEMIHOSTING=y
-
-# Boards:
-#
-CONFIG_AN5206=y
-CONFIG_MCF5208=y
-CONFIG_NEXTCUBE=y
-CONFIG_Q800=y
-CONFIG_M68K_VIRT=y
diff --git a/default-configs/devices/microblaze-softmmu.mak b/default-configs/devices/microblaze-softmmu.mak
deleted file mode 100644
index db8c6e4bba..0000000000
--- a/default-configs/devices/microblaze-softmmu.mak
+++ /dev/null
@@ -1,7 +0,0 @@
-# Default configuration for microblaze-softmmu
-
-# Boards:
-#
-CONFIG_PETALOGIX_S3ADSP1800=y
-CONFIG_PETALOGIX_ML605=y
-CONFIG_XLNX_ZYNQMP_PMU=y
diff --git a/default-configs/devices/microblazeel-softmmu.mak b/default-configs/devices/microblazeel-softmmu.mak
deleted file mode 100644
index 2fcf442fc7..0000000000
--- a/default-configs/devices/microblazeel-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for microblazeel-softmmu
-
-include microblaze-softmmu.mak
diff --git a/default-configs/devices/mips-softmmu-common.mak b/default-configs/devices/mips-softmmu-common.mak
deleted file mode 100644
index ea78fe7275..0000000000
--- a/default-configs/devices/mips-softmmu-common.mak
+++ /dev/null
@@ -1,41 +0,0 @@
-# Common mips*-softmmu CONFIG defines
-
-# CONFIG_SEMIHOSTING is always required on this architecture
-CONFIG_SEMIHOSTING=y
-
-CONFIG_ISA_BUS=y
-CONFIG_PCI=y
-CONFIG_PCI_DEVICES=y
-CONFIG_VGA_ISA=y
-CONFIG_VGA_ISA_MM=y
-CONFIG_VGA_CIRRUS=y
-CONFIG_VMWARE_VGA=y
-CONFIG_SERIAL=y
-CONFIG_SERIAL_ISA=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_NVDIMM=y
-CONFIG_ACPI_CPU_HOTPLUG=y
-CONFIG_APM=y
-CONFIG_I8257=y
-CONFIG_PIIX4=y
-CONFIG_IDE_ISA=y
-CONFIG_IDE_PIIX=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_I8259=y
-CONFIG_MC146818RTC=y
-CONFIG_EMPTY_SLOT=y
-CONFIG_MIPS_CPS=y
-CONFIG_MIPS_ITU=y
-CONFIG_MALTA=y
-CONFIG_PCNET_PCI=y
-CONFIG_MIPSSIM=y
-CONFIG_ACPI_SMBUS=y
-CONFIG_SMBUS_EEPROM=y
-CONFIG_TEST_DEVICES=y
diff --git a/default-configs/devices/mips-softmmu.mak b/default-configs/devices/mips-softmmu.mak
deleted file mode 100644
index 9fede6e00f..0000000000
--- a/default-configs/devices/mips-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for mips-softmmu
-
-include mips-softmmu-common.mak
diff --git a/default-configs/devices/mips64-softmmu.mak b/default-configs/devices/mips64-softmmu.mak
deleted file mode 100644
index a169738635..0000000000
--- a/default-configs/devices/mips64-softmmu.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default configuration for mips64-softmmu
-
-include mips-softmmu-common.mak
-CONFIG_JAZZ=y
diff --git a/default-configs/devices/mips64el-softmmu.mak b/default-configs/devices/mips64el-softmmu.mak
deleted file mode 100644
index 26c660a05c..0000000000
--- a/default-configs/devices/mips64el-softmmu.mak
+++ /dev/null
@@ -1,15 +0,0 @@
-# Default configuration for mips64el-softmmu
-
-include mips-softmmu-common.mak
-CONFIG_IDE_VIA=y
-CONFIG_FULOONG=y
-CONFIG_LOONGSON3V=y
-CONFIG_ATI_VGA=y
-CONFIG_RTL8139_PCI=y
-CONFIG_JAZZ=y
-CONFIG_VT82C686=y
-CONFIG_AHCI=y
-CONFIG_MIPS_BOSTON=y
-CONFIG_FITLOADER=y
-CONFIG_PCI_EXPRESS=y
-CONFIG_PCI_EXPRESS_XILINX=y
diff --git a/default-configs/devices/mipsel-softmmu.mak b/default-configs/devices/mipsel-softmmu.mak
deleted file mode 100644
index a7f6059484..0000000000
--- a/default-configs/devices/mipsel-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for mipsel-softmmu
-
-include mips-softmmu-common.mak
diff --git a/default-configs/devices/nios2-softmmu.mak b/default-configs/devices/nios2-softmmu.mak
deleted file mode 100644
index 1bc4082ea9..0000000000
--- a/default-configs/devices/nios2-softmmu.mak
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default configuration for nios2-softmmu
-
-CONFIG_SEMIHOSTING=y
-
-# Boards:
-#
-CONFIG_NIOS2_10M50=y
-CONFIG_NIOS2_GENERIC_NOMMU=y
diff --git a/default-configs/devices/or1k-softmmu.mak b/default-configs/devices/or1k-softmmu.mak
deleted file mode 100644
index 168101c39a..0000000000
--- a/default-configs/devices/or1k-softmmu.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default configuration for or1k-softmmu
-
-# Boards:
-#
-CONFIG_OR1K_SIM=y
diff --git a/default-configs/devices/ppc-softmmu.mak b/default-configs/devices/ppc-softmmu.mak
deleted file mode 100644
index c2d41198cd..0000000000
--- a/default-configs/devices/ppc-softmmu.mak
+++ /dev/null
@@ -1,20 +0,0 @@
-# Default configuration for ppc-softmmu
-
-# For embedded PPCs:
-CONFIG_DS1338=y
-CONFIG_E500=y
-CONFIG_PPC405=y
-CONFIG_PPC440=y
-CONFIG_VIRTEX=y
-
-# For Sam460ex
-CONFIG_SAM460EX=y
-
-# For Macs
-CONFIG_MAC_OLDWORLD=y
-CONFIG_MAC_NEWWORLD=y
-
-CONFIG_PEGASOS2=n
-
-# For PReP
-CONFIG_PREP=y
diff --git a/default-configs/devices/ppc64-softmmu.mak b/default-configs/devices/ppc64-softmmu.mak
deleted file mode 100644
index cca52665d9..0000000000
--- a/default-configs/devices/ppc64-softmmu.mak
+++ /dev/null
@@ -1,10 +0,0 @@
-# Default configuration for ppc64-softmmu
-
-# Include all 32-bit boards
-include ppc-softmmu.mak
-
-# For PowerNV
-CONFIG_POWERNV=y
-
-# For pSeries
-CONFIG_PSERIES=y
diff --git a/default-configs/devices/riscv32-softmmu.mak b/default-configs/devices/riscv32-softmmu.mak
deleted file mode 100644
index d847bd5692..0000000000
--- a/default-configs/devices/riscv32-softmmu.mak
+++ /dev/null
@@ -1,15 +0,0 @@
-# Default configuration for riscv32-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_PCI_DEVICES=n
-CONFIG_SEMIHOSTING=y
-CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
-
-# Boards:
-#
-CONFIG_SPIKE=y
-CONFIG_SIFIVE_E=y
-CONFIG_SIFIVE_U=y
-CONFIG_RISCV_VIRT=y
-CONFIG_OPENTITAN=y
diff --git a/default-configs/devices/riscv64-softmmu.mak b/default-configs/devices/riscv64-softmmu.mak
deleted file mode 100644
index bc69301fa4..0000000000
--- a/default-configs/devices/riscv64-softmmu.mak
+++ /dev/null
@@ -1,16 +0,0 @@
-# Default configuration for riscv64-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_PCI_DEVICES=n
-CONFIG_SEMIHOSTING=y
-CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
-
-# Boards:
-#
-CONFIG_SPIKE=y
-CONFIG_SIFIVE_E=y
-CONFIG_SIFIVE_U=y
-CONFIG_RISCV_VIRT=y
-CONFIG_MICROCHIP_PFSOC=y
-CONFIG_SHAKTI_C=y
diff --git a/default-configs/devices/rx-softmmu.mak b/default-configs/devices/rx-softmmu.mak
deleted file mode 100644
index df2b4e4f42..0000000000
--- a/default-configs/devices/rx-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for rx-softmmu
-
-CONFIG_RX_GDBSIM=y
diff --git a/default-configs/devices/s390x-softmmu.mak b/default-configs/devices/s390x-softmmu.mak
deleted file mode 100644
index f2287a133f..0000000000
--- a/default-configs/devices/s390x-softmmu.mak
+++ /dev/null
@@ -1,13 +0,0 @@
-# Default configuration for s390x-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_TERMINAL3270=n
-#CONFIG_VFIO_AP=n
-#CONFIG_VFIO_CCW=n
-#CONFIG_VIRTIO_PCI=n
-#CONFIG_WDT_DIAG288=n
-
-# Boards:
-#
-CONFIG_S390_CCW_VIRTIO=y
diff --git a/default-configs/devices/sh4-softmmu.mak b/default-configs/devices/sh4-softmmu.mak
deleted file mode 100644
index 565e8b0b5d..0000000000
--- a/default-configs/devices/sh4-softmmu.mak
+++ /dev/null
@@ -1,11 +0,0 @@
-# Default configuration for sh4eb-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_PCI_DEVICES=n
-#CONFIG_TEST_DEVICES=n
-
-# Boards:
-#
-CONFIG_R2D=y
-CONFIG_SHIX=y
diff --git a/default-configs/devices/sh4eb-softmmu.mak b/default-configs/devices/sh4eb-softmmu.mak
deleted file mode 100644
index 522a7a50fa..0000000000
--- a/default-configs/devices/sh4eb-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for sh4eb-softmmu
-
-include sh4-softmmu.mak
diff --git a/default-configs/devices/sparc-softmmu.mak b/default-configs/devices/sparc-softmmu.mak
deleted file mode 100644
index ee85218115..0000000000
--- a/default-configs/devices/sparc-softmmu.mak
+++ /dev/null
@@ -1,11 +0,0 @@
-# Default configuration for sparc-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_TCX=n
-#CONFIG_CG3=n
-
-# Boards:
-#
-CONFIG_SUN4M=y
-CONFIG_LEON3=y
diff --git a/default-configs/devices/sparc64-softmmu.mak b/default-configs/devices/sparc64-softmmu.mak
deleted file mode 100644
index e50030a229..0000000000
--- a/default-configs/devices/sparc64-softmmu.mak
+++ /dev/null
@@ -1,12 +0,0 @@
-# Default configuration for sparc64-softmmu
-
-# Uncomment the following lines to disable these optional devices:
-#
-#CONFIG_PCI_DEVICES=n
-#CONFIG_SUNHME=n
-#CONFIG_TEST_DEVICES=n
-
-# Boards:
-#
-CONFIG_SUN4U=y
-CONFIG_NIAGARA=y
diff --git a/default-configs/devices/tricore-softmmu.mak b/default-configs/devices/tricore-softmmu.mak
deleted file mode 100644
index 5cc91cebce..0000000000
--- a/default-configs/devices/tricore-softmmu.mak
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TRIBOARD=y
diff --git a/default-configs/devices/x86_64-softmmu.mak b/default-configs/devices/x86_64-softmmu.mak
deleted file mode 100644
index 64b2ee2960..0000000000
--- a/default-configs/devices/x86_64-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for x86_64-softmmu
-
-include i386-softmmu.mak
diff --git a/default-configs/devices/xtensa-softmmu.mak b/default-configs/devices/xtensa-softmmu.mak
deleted file mode 100644
index 4fe1bf00c9..0000000000
--- a/default-configs/devices/xtensa-softmmu.mak
+++ /dev/null
@@ -1,9 +0,0 @@
-# Default configuration for Xtensa
-
-CONFIG_SEMIHOSTING=y
-
-# Boards:
-#
-CONFIG_XTENSA_SIM=y
-CONFIG_XTENSA_VIRT=y
-CONFIG_XTENSA_XTFPGA=y
diff --git a/default-configs/devices/xtensaeb-softmmu.mak b/default-configs/devices/xtensaeb-softmmu.mak
deleted file mode 100644
index f7e48c750c..0000000000
--- a/default-configs/devices/xtensaeb-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for Xtensa
-
-include xtensa-softmmu.mak
diff --git a/default-configs/targets/aarch64-linux-user.mak b/default-configs/targets/aarch64-linux-user.mak
deleted file mode 100644
index 4713253709..0000000000
--- a/default-configs/targets/aarch64-linux-user.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET_ARCH=aarch64
-TARGET_BASE_ARCH=arm
-TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml
-TARGET_HAS_BFLT=y
-CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
diff --git a/default-configs/targets/aarch64-softmmu.mak b/default-configs/targets/aarch64-softmmu.mak
deleted file mode 100644
index 7703127674..0000000000
--- a/default-configs/targets/aarch64-softmmu.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET_ARCH=aarch64
-TARGET_BASE_ARCH=arm
-TARGET_SUPPORTS_MTTCG=y
-TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml
-TARGET_NEED_FDT=y
diff --git a/default-configs/targets/aarch64_be-linux-user.mak b/default-configs/targets/aarch64_be-linux-user.mak
deleted file mode 100644
index fae831558d..0000000000
--- a/default-configs/targets/aarch64_be-linux-user.mak
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGET_ARCH=aarch64
-TARGET_BASE_ARCH=arm
-TARGET_WORDS_BIGENDIAN=y
-TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml
-TARGET_HAS_BFLT=y
-CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
diff --git a/default-configs/targets/alpha-linux-user.mak b/default-configs/targets/alpha-linux-user.mak
deleted file mode 100644
index 7e62fd796a..0000000000
--- a/default-configs/targets/alpha-linux-user.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ARCH=alpha
-TARGET_SYSTBL_ABI=common
-TARGET_SYSTBL=syscall.tbl
-TARGET_ALIGNED_ONLY=y
diff --git a/default-configs/targets/alpha-softmmu.mak b/default-configs/targets/alpha-softmmu.mak
deleted file mode 100644
index e4b874a19e..0000000000
--- a/default-configs/targets/alpha-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET_ARCH=alpha
-TARGET_ALIGNED_ONLY=y
-TARGET_SUPPORTS_MTTCG=y
diff --git a/default-configs/targets/arm-linux-user.mak b/default-configs/targets/arm-linux-user.mak
deleted file mode 100644
index e741ffd4d3..0000000000
--- a/default-configs/targets/arm-linux-user.mak
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGET_ARCH=arm
-TARGET_SYSTBL_ABI=common,oabi
-TARGET_SYSTBL=syscall.tbl
-TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml
-TARGET_HAS_BFLT=y
-CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
diff --git a/default-configs/targets/arm-softmmu.mak b/default-configs/targets/arm-softmmu.mak
deleted file mode 100644
index 84a98f4818..0000000000
--- a/default-configs/targets/arm-softmmu.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ARCH=arm
-TARGET_SUPPORTS_MTTCG=y
-TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml
-TARGET_NEED_FDT=y
diff --git a/default-configs/targets/armeb-linux-user.mak b/default-configs/targets/armeb-linux-user.mak
deleted file mode 100644
index 255e44e8b0..0000000000
--- a/default-configs/targets/armeb-linux-user.mak
+++ /dev/null
@@ -1,7 +0,0 @@
-TARGET_ARCH=arm
-TARGET_SYSTBL_ABI=common,oabi
-TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
-TARGET_XML_FILES= gdb-xml/arm-core.xml gdb-xml/arm-vfp.xml gdb-xml/arm-vfp3.xml gdb-xml/arm-neon.xml gdb-xml/arm-m-profile.xml
-TARGET_HAS_BFLT=y
-CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
diff --git a/default-configs/targets/avr-softmmu.mak b/default-configs/targets/avr-softmmu.mak
deleted file mode 100644
index e3f921c019..0000000000
--- a/default-configs/targets/avr-softmmu.mak
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_ARCH=avr
-TARGET_XML_FILES= gdb-xml/avr-cpu.xml
diff --git a/default-configs/targets/cris-linux-user.mak b/default-configs/targets/cris-linux-user.mak
deleted file mode 100644
index e483c42066..0000000000
--- a/default-configs/targets/cris-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-TARGET_ARCH=cris
diff --git a/default-configs/targets/cris-softmmu.mak b/default-configs/targets/cris-softmmu.mak
deleted file mode 100644
index e483c42066..0000000000
--- a/default-configs/targets/cris-softmmu.mak
+++ /dev/null
@@ -1 +0,0 @@
-TARGET_ARCH=cris
diff --git a/default-configs/targets/hexagon-linux-user.mak b/default-configs/targets/hexagon-linux-user.mak
deleted file mode 100644
index 003ed0a408..0000000000
--- a/default-configs/targets/hexagon-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-TARGET_ARCH=hexagon
diff --git a/default-configs/targets/hppa-linux-user.mak b/default-configs/targets/hppa-linux-user.mak
deleted file mode 100644
index f01e0a7b9e..0000000000
--- a/default-configs/targets/hppa-linux-user.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET_ARCH=hppa
-TARGET_SYSTBL_ABI=common,32
-TARGET_SYSTBL=syscall.tbl
-TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
diff --git a/default-configs/targets/hppa-softmmu.mak b/default-configs/targets/hppa-softmmu.mak
deleted file mode 100644
index e3e71eb21b..0000000000
--- a/default-configs/targets/hppa-softmmu.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ARCH=hppa
-TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
-TARGET_SUPPORTS_MTTCG=y
diff --git a/default-configs/targets/i386-bsd-user.mak b/default-configs/targets/i386-bsd-user.mak
deleted file mode 100644
index 0283bb62a0..0000000000
--- a/default-configs/targets/i386-bsd-user.mak
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_ARCH=i386
-TARGET_XML_FILES= gdb-xml/i386-32bit.xml
diff --git a/default-configs/targets/i386-linux-user.mak b/default-configs/targets/i386-linux-user.mak
deleted file mode 100644
index 5b2546a430..0000000000
--- a/default-configs/targets/i386-linux-user.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ARCH=i386
-TARGET_SYSTBL_ABI=i386
-TARGET_SYSTBL=syscall_32.tbl
-TARGET_XML_FILES= gdb-xml/i386-32bit.xml
diff --git a/default-configs/targets/i386-softmmu.mak b/default-configs/targets/i386-softmmu.mak
deleted file mode 100644
index 5babf71895..0000000000
--- a/default-configs/targets/i386-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET_ARCH=i386
-TARGET_SUPPORTS_MTTCG=y
-TARGET_XML_FILES= gdb-xml/i386-32bit.xml
diff --git a/default-configs/targets/m68k-linux-user.mak b/default-configs/targets/m68k-linux-user.mak
deleted file mode 100644
index 805d16c6ab..0000000000
--- a/default-configs/targets/m68k-linux-user.mak
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGET_ARCH=m68k
-TARGET_SYSTBL_ABI=common
-TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
-TARGET_XML_FILES= gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-core.xml gdb-xml/m68k-fp.xml
-TARGET_HAS_BFLT=y
diff --git a/default-configs/targets/m68k-softmmu.mak b/default-configs/targets/m68k-softmmu.mak
deleted file mode 100644
index 5df1a2b7d7..0000000000
--- a/default-configs/targets/m68k-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET_ARCH=m68k
-TARGET_WORDS_BIGENDIAN=y
-TARGET_XML_FILES= gdb-xml/cf-core.xml gdb-xml/cf-fp.xml gdb-xml/m68k-core.xml gdb-xml/m68k-fp.xml
diff --git a/default-configs/targets/microblaze-linux-user.mak b/default-configs/targets/microblaze-linux-user.mak
deleted file mode 100644
index 2a25bf2fa3..0000000000
--- a/default-configs/targets/microblaze-linux-user.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET_ARCH=microblaze
-TARGET_SYSTBL_ABI=common
-TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
-TARGET_HAS_BFLT=y
diff --git a/default-configs/targets/microblaze-softmmu.mak b/default-configs/targets/microblaze-softmmu.mak
deleted file mode 100644
index 33f2a00402..0000000000
--- a/default-configs/targets/microblaze-softmmu.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ARCH=microblaze
-TARGET_WORDS_BIGENDIAN=y
-TARGET_SUPPORTS_MTTCG=y
-TARGET_NEED_FDT=y
diff --git a/default-configs/targets/microblazeel-linux-user.mak b/default-configs/targets/microblazeel-linux-user.mak
deleted file mode 100644
index d0e775d840..0000000000
--- a/default-configs/targets/microblazeel-linux-user.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ARCH=microblaze
-TARGET_SYSTBL_ABI=common
-TARGET_SYSTBL=syscall.tbl
-TARGET_HAS_BFLT=y
diff --git a/default-configs/targets/microblazeel-softmmu.mak b/default-configs/targets/microblazeel-softmmu.mak
deleted file mode 100644
index af40391f2f..0000000000
--- a/default-configs/targets/microblazeel-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET_ARCH=microblaze
-TARGET_SUPPORTS_MTTCG=y
-TARGET_NEED_FDT=y
diff --git a/default-configs/targets/mips-linux-user.mak b/default-configs/targets/mips-linux-user.mak
deleted file mode 100644
index 19f5779831..0000000000
--- a/default-configs/targets/mips-linux-user.mak
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGET_ARCH=mips
-TARGET_ABI_MIPSO32=y
-TARGET_SYSTBL_ABI=o32
-TARGET_SYSTBL=syscall_o32.tbl
-TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
diff --git a/default-configs/targets/mips-softmmu.mak b/default-configs/targets/mips-softmmu.mak
deleted file mode 100644
index 8a49999a47..0000000000
--- a/default-configs/targets/mips-softmmu.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ARCH=mips
-TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
-TARGET_SUPPORTS_MTTCG=y
diff --git a/default-configs/targets/mips64-linux-user.mak b/default-configs/targets/mips64-linux-user.mak
deleted file mode 100644
index 32fd1acdf2..0000000000
--- a/default-configs/targets/mips64-linux-user.mak
+++ /dev/null
@@ -1,7 +0,0 @@
-TARGET_ARCH=mips64
-TARGET_ABI_MIPSN64=y
-TARGET_BASE_ARCH=mips
-TARGET_SYSTBL_ABI=n64
-TARGET_SYSTBL=syscall_n64.tbl
-TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
diff --git a/default-configs/targets/mips64-softmmu.mak b/default-configs/targets/mips64-softmmu.mak
deleted file mode 100644
index ece25b9624..0000000000
--- a/default-configs/targets/mips64-softmmu.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ARCH=mips64
-TARGET_BASE_ARCH=mips
-TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
diff --git a/default-configs/targets/mips64el-linux-user.mak b/default-configs/targets/mips64el-linux-user.mak
deleted file mode 100644
index f348f35997..0000000000
--- a/default-configs/targets/mips64el-linux-user.mak
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGET_ARCH=mips64
-TARGET_ABI_MIPSN64=y
-TARGET_BASE_ARCH=mips
-TARGET_SYSTBL_ABI=n64
-TARGET_SYSTBL=syscall_n64.tbl
-TARGET_ALIGNED_ONLY=y
diff --git a/default-configs/targets/mips64el-softmmu.mak b/default-configs/targets/mips64el-softmmu.mak
deleted file mode 100644
index 5a52aa4b64..0000000000
--- a/default-configs/targets/mips64el-softmmu.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ARCH=mips64
-TARGET_BASE_ARCH=mips
-TARGET_ALIGNED_ONLY=y
-TARGET_NEED_FDT=y
diff --git a/default-configs/targets/mipsel-linux-user.mak b/default-configs/targets/mipsel-linux-user.mak
deleted file mode 100644
index e23793070c..0000000000
--- a/default-configs/targets/mipsel-linux-user.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET_ARCH=mips
-TARGET_ABI_MIPSO32=y
-TARGET_SYSTBL_ABI=o32
-TARGET_SYSTBL=syscall_o32.tbl
-TARGET_ALIGNED_ONLY=y
diff --git a/default-configs/targets/mipsel-softmmu.mak b/default-configs/targets/mipsel-softmmu.mak
deleted file mode 100644
index c7c41f4fb7..0000000000
--- a/default-configs/targets/mipsel-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET_ARCH=mips
-TARGET_ALIGNED_ONLY=y
-TARGET_SUPPORTS_MTTCG=y
diff --git a/default-configs/targets/mipsn32-linux-user.mak b/default-configs/targets/mipsn32-linux-user.mak
deleted file mode 100644
index b8c2441ad0..0000000000
--- a/default-configs/targets/mipsn32-linux-user.mak
+++ /dev/null
@@ -1,8 +0,0 @@
-TARGET_ARCH=mips64
-TARGET_ABI_MIPSN32=y
-TARGET_ABI32=y
-TARGET_BASE_ARCH=mips
-TARGET_SYSTBL_ABI=n32
-TARGET_SYSTBL=syscall_n32.tbl
-TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
diff --git a/default-configs/targets/mipsn32el-linux-user.mak b/default-configs/targets/mipsn32el-linux-user.mak
deleted file mode 100644
index f31a9c394b..0000000000
--- a/default-configs/targets/mipsn32el-linux-user.mak
+++ /dev/null
@@ -1,7 +0,0 @@
-TARGET_ARCH=mips64
-TARGET_ABI_MIPSN32=y
-TARGET_ABI32=y
-TARGET_BASE_ARCH=mips
-TARGET_SYSTBL_ABI=n32
-TARGET_SYSTBL=syscall_n32.tbl
-TARGET_ALIGNED_ONLY=y
diff --git a/default-configs/targets/nios2-linux-user.mak b/default-configs/targets/nios2-linux-user.mak
deleted file mode 100644
index 9a372f0717..0000000000
--- a/default-configs/targets/nios2-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-TARGET_ARCH=nios2
diff --git a/default-configs/targets/nios2-softmmu.mak b/default-configs/targets/nios2-softmmu.mak
deleted file mode 100644
index 9a372f0717..0000000000
--- a/default-configs/targets/nios2-softmmu.mak
+++ /dev/null
@@ -1 +0,0 @@
-TARGET_ARCH=nios2
diff --git a/default-configs/targets/or1k-linux-user.mak b/default-configs/targets/or1k-linux-user.mak
deleted file mode 100644
index 1dfb93e46d..0000000000
--- a/default-configs/targets/or1k-linux-user.mak
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_ARCH=openrisc
-TARGET_WORDS_BIGENDIAN=y
diff --git a/default-configs/targets/or1k-softmmu.mak b/default-configs/targets/or1k-softmmu.mak
deleted file mode 100644
index 1dfb93e46d..0000000000
--- a/default-configs/targets/or1k-softmmu.mak
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_ARCH=openrisc
-TARGET_WORDS_BIGENDIAN=y
diff --git a/default-configs/targets/ppc-linux-user.mak b/default-configs/targets/ppc-linux-user.mak
deleted file mode 100644
index ca4187e4aa..0000000000
--- a/default-configs/targets/ppc-linux-user.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET_ARCH=ppc
-TARGET_SYSTBL_ABI=common,nospu,32
-TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
-TARGET_XML_FILES= gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml
diff --git a/default-configs/targets/ppc-softmmu.mak b/default-configs/targets/ppc-softmmu.mak
deleted file mode 100644
index f4eef1819a..0000000000
--- a/default-configs/targets/ppc-softmmu.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ARCH=ppc
-TARGET_WORDS_BIGENDIAN=y
-TARGET_XML_FILES= gdb-xml/power-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml
-TARGET_NEED_FDT=y
diff --git a/default-configs/targets/ppc64-linux-user.mak b/default-configs/targets/ppc64-linux-user.mak
deleted file mode 100644
index 3133346676..0000000000
--- a/default-configs/targets/ppc64-linux-user.mak
+++ /dev/null
@@ -1,7 +0,0 @@
-TARGET_ARCH=ppc64
-TARGET_BASE_ARCH=ppc
-TARGET_ABI_DIR=ppc
-TARGET_SYSTBL_ABI=common,nospu,64
-TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
-TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml
diff --git a/default-configs/targets/ppc64-softmmu.mak b/default-configs/targets/ppc64-softmmu.mak
deleted file mode 100644
index 84fbf46be9..0000000000
--- a/default-configs/targets/ppc64-softmmu.mak
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGET_ARCH=ppc64
-TARGET_BASE_ARCH=ppc
-TARGET_WORDS_BIGENDIAN=y
-TARGET_SUPPORTS_MTTCG=y
-TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml
-TARGET_NEED_FDT=y
diff --git a/default-configs/targets/ppc64abi32-linux-user.mak b/default-configs/targets/ppc64abi32-linux-user.mak
deleted file mode 100644
index 0945451081..0000000000
--- a/default-configs/targets/ppc64abi32-linux-user.mak
+++ /dev/null
@@ -1,8 +0,0 @@
-TARGET_ARCH=ppc64
-TARGET_ABI32=y
-TARGET_BASE_ARCH=ppc
-TARGET_ABI_DIR=ppc
-TARGET_SYSTBL_ABI=common,nospu,32
-TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
-TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml
diff --git a/default-configs/targets/ppc64le-linux-user.mak b/default-configs/targets/ppc64le-linux-user.mak
deleted file mode 100644
index 426d5a28d6..0000000000
--- a/default-configs/targets/ppc64le-linux-user.mak
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGET_ARCH=ppc64
-TARGET_BASE_ARCH=ppc
-TARGET_ABI_DIR=ppc
-TARGET_SYSTBL_ABI=common,nospu,64
-TARGET_SYSTBL=syscall.tbl
-TARGET_XML_FILES= gdb-xml/power64-core.xml gdb-xml/power-fpu.xml gdb-xml/power-altivec.xml gdb-xml/power-spe.xml gdb-xml/power-vsx.xml
diff --git a/default-configs/targets/riscv32-linux-user.mak b/default-configs/targets/riscv32-linux-user.mak
deleted file mode 100644
index bd2f1fd497..0000000000
--- a/default-configs/targets/riscv32-linux-user.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET_ARCH=riscv32
-TARGET_BASE_ARCH=riscv
-TARGET_ABI_DIR=riscv
-TARGET_XML_FILES= gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-virtual.xml
-CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
diff --git a/default-configs/targets/riscv32-softmmu.mak b/default-configs/targets/riscv32-softmmu.mak
deleted file mode 100644
index d8b71cddcd..0000000000
--- a/default-configs/targets/riscv32-softmmu.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET_ARCH=riscv32
-TARGET_BASE_ARCH=riscv
-TARGET_SUPPORTS_MTTCG=y
-TARGET_XML_FILES= gdb-xml/riscv-32bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-32bit-virtual.xml
-TARGET_NEED_FDT=y
diff --git a/default-configs/targets/riscv64-linux-user.mak b/default-configs/targets/riscv64-linux-user.mak
deleted file mode 100644
index 4aca7662ce..0000000000
--- a/default-configs/targets/riscv64-linux-user.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET_ARCH=riscv64
-TARGET_BASE_ARCH=riscv
-TARGET_ABI_DIR=riscv
-TARGET_XML_FILES= gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-virtual.xml
-CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
diff --git a/default-configs/targets/riscv64-softmmu.mak b/default-configs/targets/riscv64-softmmu.mak
deleted file mode 100644
index 7c0e7eeb42..0000000000
--- a/default-configs/targets/riscv64-softmmu.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET_ARCH=riscv64
-TARGET_BASE_ARCH=riscv
-TARGET_SUPPORTS_MTTCG=y
-TARGET_XML_FILES= gdb-xml/riscv-64bit-cpu.xml gdb-xml/riscv-32bit-fpu.xml gdb-xml/riscv-64bit-fpu.xml gdb-xml/riscv-64bit-virtual.xml
-TARGET_NEED_FDT=y
diff --git a/default-configs/targets/rx-softmmu.mak b/default-configs/targets/rx-softmmu.mak
deleted file mode 100644
index 0c458b2d07..0000000000
--- a/default-configs/targets/rx-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET_ARCH=rx
-TARGET_XML_FILES= gdb-xml/rx-core.xml
-TARGET_NEED_FDT=y
diff --git a/default-configs/targets/s390x-linux-user.mak b/default-configs/targets/s390x-linux-user.mak
deleted file mode 100644
index 9e31ce6457..0000000000
--- a/default-configs/targets/s390x-linux-user.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET_ARCH=s390x
-TARGET_SYSTBL_ABI=common,64
-TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
-TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-gs.xml
diff --git a/default-configs/targets/s390x-softmmu.mak b/default-configs/targets/s390x-softmmu.mak
deleted file mode 100644
index fd9fbd870d..0000000000
--- a/default-configs/targets/s390x-softmmu.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ARCH=s390x
-TARGET_WORDS_BIGENDIAN=y
-TARGET_SUPPORTS_MTTCG=y
-TARGET_XML_FILES= gdb-xml/s390x-core64.xml gdb-xml/s390-acr.xml gdb-xml/s390-fpr.xml gdb-xml/s390-vx.xml gdb-xml/s390-cr.xml gdb-xml/s390-virt.xml gdb-xml/s390-gs.xml
diff --git a/default-configs/targets/sh4-linux-user.mak b/default-configs/targets/sh4-linux-user.mak
deleted file mode 100644
index 0152d6621e..0000000000
--- a/default-configs/targets/sh4-linux-user.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET_ARCH=sh4
-TARGET_SYSTBL_ABI=common
-TARGET_SYSTBL=syscall.tbl
-TARGET_ALIGNED_ONLY=y
-TARGET_HAS_BFLT=y
diff --git a/default-configs/targets/sh4-softmmu.mak b/default-configs/targets/sh4-softmmu.mak
deleted file mode 100644
index 95896376c4..0000000000
--- a/default-configs/targets/sh4-softmmu.mak
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_ARCH=sh4
-TARGET_ALIGNED_ONLY=y
diff --git a/default-configs/targets/sh4eb-linux-user.mak b/default-configs/targets/sh4eb-linux-user.mak
deleted file mode 100644
index 9b6fb4c1bb..0000000000
--- a/default-configs/targets/sh4eb-linux-user.mak
+++ /dev/null
@@ -1,6 +0,0 @@
-TARGET_ARCH=sh4
-TARGET_SYSTBL_ABI=common
-TARGET_SYSTBL=syscall.tbl
-TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
-TARGET_HAS_BFLT=y
diff --git a/default-configs/targets/sh4eb-softmmu.mak b/default-configs/targets/sh4eb-softmmu.mak
deleted file mode 100644
index 382e9a80f8..0000000000
--- a/default-configs/targets/sh4eb-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET_ARCH=sh4
-TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
diff --git a/default-configs/targets/sparc-linux-user.mak b/default-configs/targets/sparc-linux-user.mak
deleted file mode 100644
index 53dc7aaed5..0000000000
--- a/default-configs/targets/sparc-linux-user.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET_ARCH=sparc
-TARGET_SYSTBL_ABI=common,32
-TARGET_SYSTBL=syscall.tbl
-TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
diff --git a/default-configs/targets/sparc-softmmu.mak b/default-configs/targets/sparc-softmmu.mak
deleted file mode 100644
index 9ba3d7b07f..0000000000
--- a/default-configs/targets/sparc-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET_ARCH=sparc
-TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
diff --git a/default-configs/targets/sparc32plus-linux-user.mak b/default-configs/targets/sparc32plus-linux-user.mak
deleted file mode 100644
index e4c51df3dc..0000000000
--- a/default-configs/targets/sparc32plus-linux-user.mak
+++ /dev/null
@@ -1,8 +0,0 @@
-TARGET_ARCH=sparc64
-TARGET_ABI32=y
-TARGET_BASE_ARCH=sparc
-TARGET_ABI_DIR=sparc
-TARGET_SYSTBL_ABI=common,32
-TARGET_SYSTBL=syscall.tbl
-TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
diff --git a/default-configs/targets/sparc64-linux-user.mak b/default-configs/targets/sparc64-linux-user.mak
deleted file mode 100644
index 9d23ab4a26..0000000000
--- a/default-configs/targets/sparc64-linux-user.mak
+++ /dev/null
@@ -1,7 +0,0 @@
-TARGET_ARCH=sparc64
-TARGET_BASE_ARCH=sparc
-TARGET_ABI_DIR=sparc
-TARGET_SYSTBL_ABI=common,64
-TARGET_SYSTBL=syscall.tbl
-TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
diff --git a/default-configs/targets/sparc64-softmmu.mak b/default-configs/targets/sparc64-softmmu.mak
deleted file mode 100644
index 8dd3217800..0000000000
--- a/default-configs/targets/sparc64-softmmu.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ARCH=sparc64
-TARGET_BASE_ARCH=sparc
-TARGET_ALIGNED_ONLY=y
-TARGET_WORDS_BIGENDIAN=y
diff --git a/default-configs/targets/tricore-softmmu.mak b/default-configs/targets/tricore-softmmu.mak
deleted file mode 100644
index 96b10af853..0000000000
--- a/default-configs/targets/tricore-softmmu.mak
+++ /dev/null
@@ -1 +0,0 @@
-TARGET_ARCH=tricore
diff --git a/default-configs/targets/x86_64-bsd-user.mak b/default-configs/targets/x86_64-bsd-user.mak
deleted file mode 100644
index 799cd4acd4..0000000000
--- a/default-configs/targets/x86_64-bsd-user.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET_ARCH=x86_64
-TARGET_BASE_ARCH=i386
-TARGET_XML_FILES= gdb-xml/i386-64bit.xml
diff --git a/default-configs/targets/x86_64-linux-user.mak b/default-configs/targets/x86_64-linux-user.mak
deleted file mode 100644
index 9ceefbb615..0000000000
--- a/default-configs/targets/x86_64-linux-user.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET_ARCH=x86_64
-TARGET_BASE_ARCH=i386
-TARGET_SYSTBL_ABI=common,64
-TARGET_SYSTBL=syscall_64.tbl
-TARGET_XML_FILES= gdb-xml/i386-64bit.xml
diff --git a/default-configs/targets/x86_64-softmmu.mak b/default-configs/targets/x86_64-softmmu.mak
deleted file mode 100644
index 75e42bc840..0000000000
--- a/default-configs/targets/x86_64-softmmu.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ARCH=x86_64
-TARGET_BASE_ARCH=i386
-TARGET_SUPPORTS_MTTCG=y
-TARGET_XML_FILES= gdb-xml/i386-64bit.xml
diff --git a/default-configs/targets/xtensa-linux-user.mak b/default-configs/targets/xtensa-linux-user.mak
deleted file mode 100644
index 420b30a68d..0000000000
--- a/default-configs/targets/xtensa-linux-user.mak
+++ /dev/null
@@ -1,4 +0,0 @@
-TARGET_ARCH=xtensa
-TARGET_SYSTBL_ABI=common
-TARGET_SYSTBL=syscall.tbl
-TARGET_HAS_BFLT=y
diff --git a/default-configs/targets/xtensa-softmmu.mak b/default-configs/targets/xtensa-softmmu.mak
deleted file mode 100644
index f075557bfa..0000000000
--- a/default-configs/targets/xtensa-softmmu.mak
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_ARCH=xtensa
-TARGET_SUPPORTS_MTTCG=y
diff --git a/default-configs/targets/xtensaeb-linux-user.mak b/default-configs/targets/xtensaeb-linux-user.mak
deleted file mode 100644
index 1ea0f1ba91..0000000000
--- a/default-configs/targets/xtensaeb-linux-user.mak
+++ /dev/null
@@ -1,5 +0,0 @@
-TARGET_ARCH=xtensa
-TARGET_SYSTBL_ABI=common
-TARGET_SYSTBL=syscall.tbl
-TARGET_WORDS_BIGENDIAN=y
-TARGET_HAS_BFLT=y
diff --git a/default-configs/targets/xtensaeb-softmmu.mak b/default-configs/targets/xtensaeb-softmmu.mak
deleted file mode 100644
index 405cf5acbb..0000000000
--- a/default-configs/targets/xtensaeb-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET_ARCH=xtensa
-TARGET_WORDS_BIGENDIAN=y
-TARGET_SUPPORTS_MTTCG=y