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>

31 files changed, 0 insertions, 341 deletions

diff --git a/default-configs/devices/aarch64-softmmu.mak b/default-configs/devices/aarch64-softmmu.mak
deleted file mode 100644
index 958b1e0..0000000
--- 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 d186fe8..0000000
--- 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 4114aa9..0000000
--- 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 80218ad..0000000
--- 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 5932cf4..0000000
--- 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 b64c5eb..0000000
--- 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 84d1a24..0000000
--- 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 7f8619e..0000000
--- 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 db8c6e4..0000000
--- 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 2fcf442..0000000
--- 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 ea78fe7..0000000
--- 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 9fede6e..0000000
--- 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 a169738..0000000
--- 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 26c660a..0000000
--- 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 a7f6059..0000000
--- 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 1bc4082..0000000
--- 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 168101c..0000000
--- 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 c2d4119..0000000
--- 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 cca5266..0000000
--- 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 d847bd5..0000000
--- 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 bc69301..0000000
--- 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 df2b4e4..0000000
--- 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 f2287a1..0000000
--- 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 565e8b0..0000000
--- 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 522a7a5..0000000
--- 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 ee85218..0000000
--- 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 e50030a..0000000
--- 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 5cc91ce..0000000
--- 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 64b2ee2..0000000
--- 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 4fe1bf0..0000000
--- 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 f7e48c7..0000000
--- a/default-configs/devices/xtensaeb-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default configuration for Xtensa
-
-include xtensa-softmmu.mak