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>

diff --git a/MAINTAINERS b/MAINTAINERS
index 809830c6551312dc8f3b00b7bcb75653adc83f4c..cd17c72e8d35cd3f29f60ff06b80001aa99895e5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -87,7 +87,7 @@ S390 general architecture support
 M: Cornelia Huck <cohuck@redhat.com>
 M: Thomas Huth <thuth@redhat.com>
 S: Supported
-F: default-configs/*/s390x-softmmu.mak
+F: configs/devices/s390x-softmmu/default.mak
 F: gdb-xml/s390*.xml
 F: hw/char/sclp*.[hc]
 F: hw/char/terminal3270.c
@@ -196,7 +196,7 @@ F: target/hexagon/
 F: linux-user/hexagon/
 F: tests/tcg/hexagon/
 F: disas/hexagon.c
-F: default-configs/targets/hexagon-linux-user.mak
+F: configs/targets/hexagon-linux-user/default.mak
 F: docker/dockerfiles/debian-hexagon-cross.docker
 F: docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh
 
@@ -229,7 +229,7 @@ R: Jiaxun Yang <jiaxun.yang@flygoat.com>
 R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
 S: Odd Fixes
 F: target/mips/
-F: default-configs/*/*mips*
+F: configs/devices/mips*/*
 F: disas/mips.c
 F: docs/system/cpu-models-mips.rst.inc
 F: hw/intc/mips_gic.c
@@ -255,7 +255,7 @@ S: Maintained
 F: target/nios2/
 F: hw/nios2/
 F: disas/nios2.c
-F: default-configs/*/nios2-softmmu.mak
+F: configs/devices/nios2-softmmu/default.mak
 
 OpenRISC TCG CPUs
 M: Stafford Horne <shorne@gmail.com>
@@ -342,7 +342,7 @@ F: hw/xtensa/
 F: tests/tcg/xtensa/
 F: disas/xtensa.c
 F: include/hw/xtensa/xtensa-isa.h
-F: default-configs/*/xtensa*.mak
+F: configs/devices/xtensa*/default.mak
 
 TriCore TCG CPUs
 M: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
@@ -1041,7 +1041,7 @@ AVR Machines
 AVR MCUs
 M: Michael Rolnik <mrolnik@gmail.com>
 S: Maintained
-F: default-configs/*/avr-softmmu.mak
+F: configs/devices/avr-softmmu/default.mak
 F: hw/avr/
 F: include/hw/char/avr_usart.h
 F: hw/char/avr_usart.c
@@ -1069,7 +1069,7 @@ HP B160L
 M: Richard Henderson <richard.henderson@linaro.org>
 R: Helge Deller <deller@gmx.de>
 S: Odd Fixes
-F: default-configs/*/hppa-softmmu.mak
+F: configs/devices/hppa-softmmu/default.mak
 F: hw/hppa/
 F: pc-bios/hppa-firmware.img
 
@@ -1496,7 +1496,7 @@ F: hw/s390x/
 F: include/hw/s390x/
 F: hw/watchdog/wdt_diag288.c
 F: include/hw/watchdog/wdt_diag288.h
-F: default-configs/*/s390x-softmmu.mak
+F: configs/devices/s390x-softmmu/default.mak
 F: tests/acceptance/machine_s390_ccw_virtio.py
 T: git https://gitlab.com/cohuck/qemu.git s390-next
 T: git https://github.com/borntraeger/qemu.git s390-next
@@ -1703,7 +1703,6 @@ F: hw/pci-bridge/*
 F: qapi/pci.json
 F: docs/pci*
 F: docs/specs/*pci*
-F: default-configs/pci.mak
 
 ACPI/SMBIOS
 M: Michael S. Tsirkin <mst@redhat.com>
@@ -1808,7 +1807,6 @@ F: docs/usb2.txt
 F: docs/usb-storage.txt
 F: include/hw/usb.h
 F: include/hw/usb/
-F: default-configs/usb.mak
 
 USB (serial adapter)
 M: Gerd Hoffmann <kraxel@redhat.com>
@@ -2967,14 +2965,14 @@ M: Warner Losh <imp@bsdimp.com>
 R: Kyle Evans <kevans@freebsd.org>
 S: Maintained
 F: bsd-user/
-F: default-configs/targets/*-bsd-user.mak
+F: configs/targets/*-bsd-user.mak
 T: git https://github.com/qemu-bsd-user/qemu-bsd-user bsd-user-rebase-3.1
 
 Linux user
 M: Laurent Vivier <laurent@vivier.eu>
 S: Maintained
 F: linux-user/
-F: default-configs/targets/*linux-user.mak
+F: configs/targets/*linux-user.mak
 F: scripts/qemu-binfmt-conf.sh
 F: scripts/update-syscalltbl.sh
 F: scripts/update-mips-syscall-args.sh

diff --git a/configs/devices/aarch64-softmmu/default.mak b/configs/devices/aarch64-softmmu/default.mak
new file mode 100644 (file)
index 0000000..cf43ac8
--- /dev/null
+++ b/configs/devices/aarch64-softmmu/default.mak
@@ -0,0 +1,8 @@
+# Default configuration for aarch64-softmmu
+
+# We support all the 32 bit boards so need all their config
+include ../arm-softmmu/default.mak
+
+CONFIG_XLNX_ZYNQMP_ARM=y
+CONFIG_XLNX_VERSAL=y
+CONFIG_SBSA_REF=y

diff --git a/configs/devices/alpha-softmmu/default.mak b/configs/devices/alpha-softmmu/default.mak
new file mode 100644 (file)
index 0000000..d186fe8
--- /dev/null
+++ b/configs/devices/alpha-softmmu/default.mak
@@ -0,0 +1,10 @@
+# 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/configs/devices/arm-softmmu/default.mak b/configs/devices/arm-softmmu/default.mak
new file mode 100644 (file)
index 0000000..4114aa9
--- /dev/null
+++ b/configs/devices/arm-softmmu/default.mak
@@ -0,0 +1,43 @@
+# 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/configs/devices/avr-softmmu/default.mak b/configs/devices/avr-softmmu/default.mak
new file mode 100644 (file)
index 0000000..80218ad
--- /dev/null
+++ b/configs/devices/avr-softmmu/default.mak
@@ -0,0 +1,5 @@
+# Default configuration for avr-softmmu
+
+# Boards:
+#
+CONFIG_ARDUINO=y

diff --git a/configs/devices/cris-softmmu/default.mak b/configs/devices/cris-softmmu/default.mak
new file mode 100644 (file)
index 0000000..5932cf4
--- /dev/null
+++ b/configs/devices/cris-softmmu/default.mak
@@ -0,0 +1,5 @@
+# Default configuration for cris-softmmu
+
+# Boards:
+#
+CONFIG_AXIS=y

diff --git a/configs/devices/hppa-softmmu/default.mak b/configs/devices/hppa-softmmu/default.mak
new file mode 100644 (file)
index 0000000..b64c5eb
--- /dev/null
+++ b/configs/devices/hppa-softmmu/default.mak
@@ -0,0 +1,9 @@
+# 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/configs/devices/i386-softmmu/default.mak b/configs/devices/i386-softmmu/default.mak
new file mode 100644 (file)
index 0000000..84d1a24
--- /dev/null
+++ b/configs/devices/i386-softmmu/default.mak
@@ -0,0 +1,31 @@
+# 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/configs/devices/m68k-softmmu/default.mak b/configs/devices/m68k-softmmu/default.mak
new file mode 100644 (file)
index 0000000..7f8619e
--- /dev/null
+++ b/configs/devices/m68k-softmmu/default.mak
@@ -0,0 +1,11 @@
+# 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/configs/devices/microblaze-softmmu/default.mak b/configs/devices/microblaze-softmmu/default.mak
new file mode 100644 (file)
index 0000000..db8c6e4
--- /dev/null
+++ b/configs/devices/microblaze-softmmu/default.mak
@@ -0,0 +1,7 @@
+# Default configuration for microblaze-softmmu
+
+# Boards:
+#
+CONFIG_PETALOGIX_S3ADSP1800=y
+CONFIG_PETALOGIX_ML605=y
+CONFIG_XLNX_ZYNQMP_PMU=y

diff --git a/configs/devices/microblazeel-softmmu/default.mak b/configs/devices/microblazeel-softmmu/default.mak
new file mode 100644 (file)
index 0000000..29f7f13
--- /dev/null
+++ b/configs/devices/microblazeel-softmmu/default.mak
@@ -0,0 +1,3 @@
+# Default configuration for microblazeel-softmmu
+
+include ../microblaze-softmmu/default.mak

diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips-softmmu/common.mak
new file mode 100644 (file)
index 0000000..ea78fe7
--- /dev/null
+++ b/configs/devices/mips-softmmu/common.mak
@@ -0,0 +1,41 @@
+# 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/configs/devices/mips-softmmu/default.mak b/configs/devices/mips-softmmu/default.mak
new file mode 100644 (file)
index 0000000..c23d95a
--- /dev/null
+++ b/configs/devices/mips-softmmu/default.mak
@@ -0,0 +1,3 @@
+# Default configuration for mips-softmmu
+
+include common.mak

diff --git a/configs/devices/mips64-softmmu/default.mak b/configs/devices/mips64-softmmu/default.mak
new file mode 100644 (file)
index 0000000..566672f
--- /dev/null
+++ b/configs/devices/mips64-softmmu/default.mak
@@ -0,0 +1,4 @@
+# Default configuration for mips64-softmmu
+
+include ../mips-softmmu/common.mak
+CONFIG_JAZZ=y

diff --git a/configs/devices/mips64el-softmmu/default.mak b/configs/devices/mips64el-softmmu/default.mak
new file mode 100644 (file)
index 0000000..c511a06
--- /dev/null
+++ b/configs/devices/mips64el-softmmu/default.mak
@@ -0,0 +1,15 @@
+# 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/configs/devices/mipsel-softmmu/default.mak b/configs/devices/mipsel-softmmu/default.mak
new file mode 100644 (file)
index 0000000..009ccb0
--- /dev/null
+++ b/configs/devices/mipsel-softmmu/default.mak
@@ -0,0 +1,3 @@
+# Default configuration for mipsel-softmmu
+
+include ../mips-softmmu/common.mak

diff --git a/configs/devices/nios2-softmmu/default.mak b/configs/devices/nios2-softmmu/default.mak
new file mode 100644 (file)
index 0000000..1bc4082
--- /dev/null
+++ b/configs/devices/nios2-softmmu/default.mak
@@ -0,0 +1,8 @@
+# Default configuration for nios2-softmmu
+
+CONFIG_SEMIHOSTING=y
+
+# Boards:
+#
+CONFIG_NIOS2_10M50=y
+CONFIG_NIOS2_GENERIC_NOMMU=y

diff --git a/configs/devices/or1k-softmmu/default.mak b/configs/devices/or1k-softmmu/default.mak
new file mode 100644 (file)
index 0000000..168101c
--- /dev/null
+++ b/configs/devices/or1k-softmmu/default.mak
@@ -0,0 +1,5 @@
+# Default configuration for or1k-softmmu
+
+# Boards:
+#
+CONFIG_OR1K_SIM=y

diff --git a/configs/devices/ppc-softmmu/default.mak b/configs/devices/ppc-softmmu/default.mak
new file mode 100644 (file)
index 0000000..c2d4119
--- /dev/null
+++ b/configs/devices/ppc-softmmu/default.mak
@@ -0,0 +1,20 @@
+# 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/configs/devices/ppc64-softmmu/default.mak b/configs/devices/ppc64-softmmu/default.mak
new file mode 100644 (file)
index 0000000..b90e5bf
--- /dev/null
+++ b/configs/devices/ppc64-softmmu/default.mak
@@ -0,0 +1,10 @@
+# Default configuration for ppc64-softmmu
+
+# Include all 32-bit boards
+include ../ppc-softmmu/default.mak
+
+# For PowerNV
+CONFIG_POWERNV=y
+
+# For pSeries
+CONFIG_PSERIES=y

diff --git a/configs/devices/riscv32-softmmu/default.mak b/configs/devices/riscv32-softmmu/default.mak
new file mode 100644 (file)
index 0000000..d847bd5
--- /dev/null
+++ b/configs/devices/riscv32-softmmu/default.mak
@@ -0,0 +1,15 @@
+# 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/configs/devices/riscv64-softmmu/default.mak b/configs/devices/riscv64-softmmu/default.mak
new file mode 100644 (file)
index 0000000..bc69301
--- /dev/null
+++ b/configs/devices/riscv64-softmmu/default.mak
@@ -0,0 +1,16 @@
+# 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/configs/devices/rx-softmmu/default.mak b/configs/devices/rx-softmmu/default.mak
new file mode 100644 (file)
index 0000000..df2b4e4
--- /dev/null
+++ b/configs/devices/rx-softmmu/default.mak
@@ -0,0 +1,3 @@
+# Default configuration for rx-softmmu
+
+CONFIG_RX_GDBSIM=y

diff --git a/configs/devices/s390x-softmmu/default.mak b/configs/devices/s390x-softmmu/default.mak
new file mode 100644 (file)
index 0000000..f2287a1
--- /dev/null
+++ b/configs/devices/s390x-softmmu/default.mak
@@ -0,0 +1,13 @@
+# 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/configs/devices/sh4-softmmu/default.mak b/configs/devices/sh4-softmmu/default.mak
new file mode 100644 (file)
index 0000000..565e8b0
--- /dev/null
+++ b/configs/devices/sh4-softmmu/default.mak
@@ -0,0 +1,11 @@
+# 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/configs/devices/sh4eb-softmmu/default.mak b/configs/devices/sh4eb-softmmu/default.mak
new file mode 100644 (file)
index 0000000..f18d1f6
--- /dev/null
+++ b/configs/devices/sh4eb-softmmu/default.mak
@@ -0,0 +1,3 @@
+# Default configuration for sh4eb-softmmu
+
+include ../sh4-softmmu/default.mak

diff --git a/configs/devices/sparc-softmmu/default.mak b/configs/devices/sparc-softmmu/default.mak
new file mode 100644 (file)
index 0000000..ee85218
--- /dev/null
+++ b/configs/devices/sparc-softmmu/default.mak
@@ -0,0 +1,11 @@
+# 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/configs/devices/sparc64-softmmu/default.mak b/configs/devices/sparc64-softmmu/default.mak
new file mode 100644 (file)
index 0000000..e50030a
--- /dev/null
+++ b/configs/devices/sparc64-softmmu/default.mak
@@ -0,0 +1,12 @@
+# 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/configs/devices/tricore-softmmu/default.mak b/configs/devices/tricore-softmmu/default.mak
new file mode 100644 (file)
index 0000000..5cc91ce
--- /dev/null
+++ b/configs/devices/tricore-softmmu/default.mak
@@ -0,0 +1 @@
+CONFIG_TRIBOARD=y

diff --git a/configs/devices/x86_64-softmmu/default.mak b/configs/devices/x86_64-softmmu/default.mak
new file mode 100644 (file)
index 0000000..ddfc2ea
--- /dev/null
+++ b/configs/devices/x86_64-softmmu/default.mak
@@ -0,0 +1,3 @@
+# Default configuration for x86_64-softmmu
+
+include ../i386-softmmu/default.mak

diff --git a/configs/devices/xtensa-softmmu/default.mak b/configs/devices/xtensa-softmmu/default.mak
new file mode 100644 (file)
index 0000000..4fe1bf0
--- /dev/null
+++ b/configs/devices/xtensa-softmmu/default.mak
@@ -0,0 +1,9 @@
+# Default configuration for Xtensa
+
+CONFIG_SEMIHOSTING=y
+
+# Boards:
+#
+CONFIG_XTENSA_SIM=y
+CONFIG_XTENSA_VIRT=y
+CONFIG_XTENSA_XTFPGA=y

diff --git a/configs/devices/xtensaeb-softmmu/default.mak b/configs/devices/xtensaeb-softmmu/default.mak
new file mode 100644 (file)
index 0000000..00eafcc
--- /dev/null
+++ b/configs/devices/xtensaeb-softmmu/default.mak
@@ -0,0 +1,3 @@
+# Default configuration for Xtensa
+
+include ../xtensa-softmmu/default.mak

diff --git a/configs/targets/aarch64-linux-user.mak b/configs/targets/aarch64-linux-user.mak
new file mode 100644 (file)
index 0000000..4713253
--- /dev/null
+++ b/configs/targets/aarch64-linux-user.mak
@@ -0,0 +1,5 @@
+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/configs/targets/aarch64-softmmu.mak b/configs/targets/aarch64-softmmu.mak
new file mode 100644 (file)
index 0000000..7703127
--- /dev/null
+++ b/configs/targets/aarch64-softmmu.mak
@@ -0,0 +1,5 @@
+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/configs/targets/aarch64_be-linux-user.mak b/configs/targets/aarch64_be-linux-user.mak
new file mode 100644 (file)
index 0000000..fae8315
--- /dev/null
+++ b/configs/targets/aarch64_be-linux-user.mak
@@ -0,0 +1,6 @@
+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/configs/targets/alpha-linux-user.mak b/configs/targets/alpha-linux-user.mak
new file mode 100644 (file)
index 0000000..7e62fd7
--- /dev/null
+++ b/configs/targets/alpha-linux-user.mak
@@ -0,0 +1,4 @@
+TARGET_ARCH=alpha
+TARGET_SYSTBL_ABI=common
+TARGET_SYSTBL=syscall.tbl
+TARGET_ALIGNED_ONLY=y

diff --git a/configs/targets/alpha-softmmu.mak b/configs/targets/alpha-softmmu.mak
new file mode 100644 (file)
index 0000000..e4b874a
--- /dev/null
+++ b/configs/targets/alpha-softmmu.mak
@@ -0,0 +1,3 @@
+TARGET_ARCH=alpha
+TARGET_ALIGNED_ONLY=y
+TARGET_SUPPORTS_MTTCG=y

diff --git a/configs/targets/arm-linux-user.mak b/configs/targets/arm-linux-user.mak
new file mode 100644 (file)
index 0000000..e741ffd
--- /dev/null
+++ b/configs/targets/arm-linux-user.mak
@@ -0,0 +1,6 @@
+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/configs/targets/arm-softmmu.mak b/configs/targets/arm-softmmu.mak
new file mode 100644 (file)
index 0000000..84a98f4
--- /dev/null
+++ b/configs/targets/arm-softmmu.mak
@@ -0,0 +1,4 @@
+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/configs/targets/armeb-linux-user.mak b/configs/targets/armeb-linux-user.mak
new file mode 100644 (file)
index 0000000..255e44e
--- /dev/null
+++ b/configs/targets/armeb-linux-user.mak
@@ -0,0 +1,7 @@
+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/configs/targets/avr-softmmu.mak b/configs/targets/avr-softmmu.mak
new file mode 100644 (file)
index 0000000..e3f921c
--- /dev/null
+++ b/configs/targets/avr-softmmu.mak
@@ -0,0 +1,2 @@
+TARGET_ARCH=avr
+TARGET_XML_FILES= gdb-xml/avr-cpu.xml

diff --git a/configs/targets/cris-linux-user.mak b/configs/targets/cris-linux-user.mak
new file mode 100644 (file)
index 0000000..e483c42
--- /dev/null
+++ b/configs/targets/cris-linux-user.mak
@@ -0,0 +1 @@
+TARGET_ARCH=cris

diff --git a/configs/targets/cris-softmmu.mak b/configs/targets/cris-softmmu.mak
new file mode 100644 (file)
index 0000000..e483c42
--- /dev/null
+++ b/configs/targets/cris-softmmu.mak
@@ -0,0 +1 @@
+TARGET_ARCH=cris

diff --git a/configs/targets/hexagon-linux-user.mak b/configs/targets/hexagon-linux-user.mak
new file mode 100644 (file)
index 0000000..003ed0a
--- /dev/null
+++ b/configs/targets/hexagon-linux-user.mak
@@ -0,0 +1 @@
+TARGET_ARCH=hexagon

diff --git a/configs/targets/hppa-linux-user.mak b/configs/targets/hppa-linux-user.mak
new file mode 100644 (file)
index 0000000..f01e0a7
--- /dev/null
+++ b/configs/targets/hppa-linux-user.mak
@@ -0,0 +1,5 @@
+TARGET_ARCH=hppa
+TARGET_SYSTBL_ABI=common,32
+TARGET_SYSTBL=syscall.tbl
+TARGET_ALIGNED_ONLY=y
+TARGET_WORDS_BIGENDIAN=y

diff --git a/configs/targets/hppa-softmmu.mak b/configs/targets/hppa-softmmu.mak
new file mode 100644 (file)
index 0000000..e3e71eb
--- /dev/null
+++ b/configs/targets/hppa-softmmu.mak
@@ -0,0 +1,4 @@
+TARGET_ARCH=hppa
+TARGET_ALIGNED_ONLY=y
+TARGET_WORDS_BIGENDIAN=y
+TARGET_SUPPORTS_MTTCG=y

diff --git a/configs/targets/i386-bsd-user.mak b/configs/targets/i386-bsd-user.mak
new file mode 100644 (file)
index 0000000..0283bb6
--- /dev/null
+++ b/configs/targets/i386-bsd-user.mak
@@ -0,0 +1,2 @@
+TARGET_ARCH=i386
+TARGET_XML_FILES= gdb-xml/i386-32bit.xml

diff --git a/configs/targets/i386-linux-user.mak b/configs/targets/i386-linux-user.mak
new file mode 100644 (file)
index 0000000..5b2546a
--- /dev/null
+++ b/configs/targets/i386-linux-user.mak
@@ -0,0 +1,4 @@
+TARGET_ARCH=i386
+TARGET_SYSTBL_ABI=i386
+TARGET_SYSTBL=syscall_32.tbl
+TARGET_XML_FILES= gdb-xml/i386-32bit.xml

diff --git a/configs/targets/i386-softmmu.mak b/configs/targets/i386-softmmu.mak
new file mode 100644 (file)
index 0000000..5babf71
--- /dev/null
+++ b/configs/targets/i386-softmmu.mak
@@ -0,0 +1,3 @@
+TARGET_ARCH=i386
+TARGET_SUPPORTS_MTTCG=y
+TARGET_XML_FILES= gdb-xml/i386-32bit.xml

diff --git a/configs/targets/m68k-linux-user.mak b/configs/targets/m68k-linux-user.mak
new file mode 100644 (file)
index 0000000..805d16c
--- /dev/null
+++ b/configs/targets/m68k-linux-user.mak
@@ -0,0 +1,6 @@
+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/configs/targets/m68k-softmmu.mak b/configs/targets/m68k-softmmu.mak
new file mode 100644 (file)
index 0000000..5df1a2b
--- /dev/null
+++ b/configs/targets/m68k-softmmu.mak
@@ -0,0 +1,3 @@
+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/configs/targets/microblaze-linux-user.mak b/configs/targets/microblaze-linux-user.mak
new file mode 100644 (file)
index 0000000..2a25bf2
--- /dev/null
+++ b/configs/targets/microblaze-linux-user.mak
@@ -0,0 +1,5 @@
+TARGET_ARCH=microblaze
+TARGET_SYSTBL_ABI=common
+TARGET_SYSTBL=syscall.tbl
+TARGET_WORDS_BIGENDIAN=y
+TARGET_HAS_BFLT=y

diff --git a/configs/targets/microblaze-softmmu.mak b/configs/targets/microblaze-softmmu.mak
new file mode 100644 (file)
index 0000000..33f2a00
--- /dev/null
+++ b/configs/targets/microblaze-softmmu.mak
@@ -0,0 +1,4 @@
+TARGET_ARCH=microblaze
+TARGET_WORDS_BIGENDIAN=y
+TARGET_SUPPORTS_MTTCG=y
+TARGET_NEED_FDT=y

diff --git a/configs/targets/microblazeel-linux-user.mak b/configs/targets/microblazeel-linux-user.mak
new file mode 100644 (file)
index 0000000..d0e775d
--- /dev/null
+++ b/configs/targets/microblazeel-linux-user.mak
@@ -0,0 +1,4 @@
+TARGET_ARCH=microblaze
+TARGET_SYSTBL_ABI=common
+TARGET_SYSTBL=syscall.tbl
+TARGET_HAS_BFLT=y

diff --git a/configs/targets/microblazeel-softmmu.mak b/configs/targets/microblazeel-softmmu.mak
new file mode 100644 (file)
index 0000000..af40391
--- /dev/null
+++ b/configs/targets/microblazeel-softmmu.mak
@@ -0,0 +1,3 @@
+TARGET_ARCH=microblaze
+TARGET_SUPPORTS_MTTCG=y
+TARGET_NEED_FDT=y

diff --git a/configs/targets/mips-linux-user.mak b/configs/targets/mips-linux-user.mak
new file mode 100644 (file)
index 0000000..19f5779
--- /dev/null
+++ b/configs/targets/mips-linux-user.mak
@@ -0,0 +1,6 @@
+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/configs/targets/mips-softmmu.mak b/configs/targets/mips-softmmu.mak
new file mode 100644 (file)
index 0000000..8a49999
--- /dev/null
+++ b/configs/targets/mips-softmmu.mak
@@ -0,0 +1,4 @@
+TARGET_ARCH=mips
+TARGET_ALIGNED_ONLY=y
+TARGET_WORDS_BIGENDIAN=y
+TARGET_SUPPORTS_MTTCG=y

diff --git a/configs/targets/mips64-linux-user.mak b/configs/targets/mips64-linux-user.mak
new file mode 100644 (file)
index 0000000..32fd1ac
--- /dev/null
+++ b/configs/targets/mips64-linux-user.mak
@@ -0,0 +1,7 @@
+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/configs/targets/mips64-softmmu.mak b/configs/targets/mips64-softmmu.mak
new file mode 100644 (file)
index 0000000..ece25b9
--- /dev/null
+++ b/configs/targets/mips64-softmmu.mak
@@ -0,0 +1,4 @@
+TARGET_ARCH=mips64
+TARGET_BASE_ARCH=mips
+TARGET_ALIGNED_ONLY=y
+TARGET_WORDS_BIGENDIAN=y

diff --git a/configs/targets/mips64el-linux-user.mak b/configs/targets/mips64el-linux-user.mak
new file mode 100644 (file)
index 0000000..f348f35
--- /dev/null
+++ b/configs/targets/mips64el-linux-user.mak
@@ -0,0 +1,6 @@
+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/configs/targets/mips64el-softmmu.mak b/configs/targets/mips64el-softmmu.mak
new file mode 100644 (file)
index 0000000..5a52aa4
--- /dev/null
+++ b/configs/targets/mips64el-softmmu.mak
@@ -0,0 +1,4 @@
+TARGET_ARCH=mips64
+TARGET_BASE_ARCH=mips
+TARGET_ALIGNED_ONLY=y
+TARGET_NEED_FDT=y

diff --git a/configs/targets/mipsel-linux-user.mak b/configs/targets/mipsel-linux-user.mak
new file mode 100644 (file)
index 0000000..e237930
--- /dev/null
+++ b/configs/targets/mipsel-linux-user.mak
@@ -0,0 +1,5 @@
+TARGET_ARCH=mips
+TARGET_ABI_MIPSO32=y
+TARGET_SYSTBL_ABI=o32
+TARGET_SYSTBL=syscall_o32.tbl
+TARGET_ALIGNED_ONLY=y

diff --git a/configs/targets/mipsel-softmmu.mak b/configs/targets/mipsel-softmmu.mak
new file mode 100644 (file)
index 0000000..c7c41f4
--- /dev/null
+++ b/configs/targets/mipsel-softmmu.mak
@@ -0,0 +1,3 @@
+TARGET_ARCH=mips
+TARGET_ALIGNED_ONLY=y
+TARGET_SUPPORTS_MTTCG=y

diff --git a/configs/targets/mipsn32-linux-user.mak b/configs/targets/mipsn32-linux-user.mak
new file mode 100644 (file)
index 0000000..b8c2441
--- /dev/null
+++ b/configs/targets/mipsn32-linux-user.mak
@@ -0,0 +1,8 @@
+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/configs/targets/mipsn32el-linux-user.mak b/configs/targets/mipsn32el-linux-user.mak
new file mode 100644 (file)
index 0000000..f31a9c3
--- /dev/null
+++ b/configs/targets/mipsn32el-linux-user.mak
@@ -0,0 +1,7 @@
+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/configs/targets/nios2-linux-user.mak b/configs/targets/nios2-linux-user.mak
new file mode 100644 (file)
index 0000000..9a372f0
--- /dev/null
+++ b/configs/targets/nios2-linux-user.mak
@@ -0,0 +1 @@
+TARGET_ARCH=nios2

diff --git a/configs/targets/nios2-softmmu.mak b/configs/targets/nios2-softmmu.mak
new file mode 100644 (file)
index 0000000..9a372f0
--- /dev/null
+++ b/configs/targets/nios2-softmmu.mak
@@ -0,0 +1 @@
+TARGET_ARCH=nios2

diff --git a/configs/targets/or1k-linux-user.mak b/configs/targets/or1k-linux-user.mak
new file mode 100644 (file)
index 0000000..1dfb93e
--- /dev/null
+++ b/configs/targets/or1k-linux-user.mak
@@ -0,0 +1,2 @@
+TARGET_ARCH=openrisc
+TARGET_WORDS_BIGENDIAN=y

diff --git a/configs/targets/or1k-softmmu.mak b/configs/targets/or1k-softmmu.mak
new file mode 100644 (file)
index 0000000..1dfb93e
--- /dev/null
+++ b/configs/targets/or1k-softmmu.mak
@@ -0,0 +1,2 @@
+TARGET_ARCH=openrisc
+TARGET_WORDS_BIGENDIAN=y

diff --git a/configs/targets/ppc-linux-user.mak b/configs/targets/ppc-linux-user.mak
new file mode 100644 (file)
index 0000000..ca4187e
--- /dev/null
+++ b/configs/targets/ppc-linux-user.mak
@@ -0,0 +1,5 @@
+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/configs/targets/ppc-softmmu.mak b/configs/targets/ppc-softmmu.mak
new file mode 100644 (file)
index 0000000..f4eef18
--- /dev/null
+++ b/configs/targets/ppc-softmmu.mak
@@ -0,0 +1,4 @@
+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/configs/targets/ppc64-linux-user.mak b/configs/targets/ppc64-linux-user.mak
new file mode 100644 (file)
index 0000000..3133346
--- /dev/null
+++ b/configs/targets/ppc64-linux-user.mak
@@ -0,0 +1,7 @@
+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/configs/targets/ppc64-softmmu.mak b/configs/targets/ppc64-softmmu.mak
new file mode 100644 (file)
index 0000000..84fbf46
--- /dev/null
+++ b/configs/targets/ppc64-softmmu.mak
@@ -0,0 +1,6 @@
+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/configs/targets/ppc64abi32-linux-user.mak b/configs/targets/ppc64abi32-linux-user.mak
new file mode 100644 (file)
index 0000000..0945451
--- /dev/null
+++ b/configs/targets/ppc64abi32-linux-user.mak
@@ -0,0 +1,8 @@
+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/configs/targets/ppc64le-linux-user.mak b/configs/targets/ppc64le-linux-user.mak
new file mode 100644 (file)
index 0000000..426d5a2
--- /dev/null
+++ b/configs/targets/ppc64le-linux-user.mak
@@ -0,0 +1,6 @@
+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/configs/targets/riscv32-linux-user.mak b/configs/targets/riscv32-linux-user.mak
new file mode 100644 (file)
index 0000000..bd2f1fd
--- /dev/null
+++ b/configs/targets/riscv32-linux-user.mak
@@ -0,0 +1,5 @@
+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/configs/targets/riscv32-softmmu.mak b/configs/targets/riscv32-softmmu.mak
new file mode 100644 (file)
index 0000000..d8b71cd
--- /dev/null
+++ b/configs/targets/riscv32-softmmu.mak
@@ -0,0 +1,5 @@
+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/configs/targets/riscv64-linux-user.mak b/configs/targets/riscv64-linux-user.mak
new file mode 100644 (file)
index 0000000..4aca766
--- /dev/null
+++ b/configs/targets/riscv64-linux-user.mak
@@ -0,0 +1,5 @@
+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/configs/targets/riscv64-softmmu.mak b/configs/targets/riscv64-softmmu.mak
new file mode 100644 (file)
index 0000000..7c0e7ee
--- /dev/null
+++ b/configs/targets/riscv64-softmmu.mak
@@ -0,0 +1,5 @@
+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/configs/targets/rx-softmmu.mak b/configs/targets/rx-softmmu.mak
new file mode 100644 (file)
index 0000000..0c458b2
--- /dev/null
+++ b/configs/targets/rx-softmmu.mak
@@ -0,0 +1,3 @@
+TARGET_ARCH=rx
+TARGET_XML_FILES= gdb-xml/rx-core.xml
+TARGET_NEED_FDT=y

diff --git a/configs/targets/s390x-linux-user.mak b/configs/targets/s390x-linux-user.mak
new file mode 100644 (file)
index 0000000..9e31ce6
--- /dev/null
+++ b/configs/targets/s390x-linux-user.mak
@@ -0,0 +1,5 @@
+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/configs/targets/s390x-softmmu.mak b/configs/targets/s390x-softmmu.mak
new file mode 100644 (file)
index 0000000..fd9fbd8
--- /dev/null
+++ b/configs/targets/s390x-softmmu.mak
@@ -0,0 +1,4 @@
+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/configs/targets/sh4-linux-user.mak b/configs/targets/sh4-linux-user.mak
new file mode 100644 (file)
index 0000000..0152d66
--- /dev/null
+++ b/configs/targets/sh4-linux-user.mak
@@ -0,0 +1,5 @@
+TARGET_ARCH=sh4
+TARGET_SYSTBL_ABI=common
+TARGET_SYSTBL=syscall.tbl
+TARGET_ALIGNED_ONLY=y
+TARGET_HAS_BFLT=y

diff --git a/configs/targets/sh4-softmmu.mak b/configs/targets/sh4-softmmu.mak
new file mode 100644 (file)
index 0000000..9589637
--- /dev/null
+++ b/configs/targets/sh4-softmmu.mak
@@ -0,0 +1,2 @@
+TARGET_ARCH=sh4
+TARGET_ALIGNED_ONLY=y

diff --git a/configs/targets/sh4eb-linux-user.mak b/configs/targets/sh4eb-linux-user.mak
new file mode 100644 (file)
index 0000000..9b6fb4c
--- /dev/null
+++ b/configs/targets/sh4eb-linux-user.mak
@@ -0,0 +1,6 @@
+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/configs/targets/sh4eb-softmmu.mak b/configs/targets/sh4eb-softmmu.mak
new file mode 100644 (file)
index 0000000..382e9a8
--- /dev/null
+++ b/configs/targets/sh4eb-softmmu.mak
@@ -0,0 +1,3 @@
+TARGET_ARCH=sh4
+TARGET_ALIGNED_ONLY=y
+TARGET_WORDS_BIGENDIAN=y

diff --git a/configs/targets/sparc-linux-user.mak b/configs/targets/sparc-linux-user.mak
new file mode 100644 (file)
index 0000000..53dc7aa
--- /dev/null
+++ b/configs/targets/sparc-linux-user.mak
@@ -0,0 +1,5 @@
+TARGET_ARCH=sparc
+TARGET_SYSTBL_ABI=common,32
+TARGET_SYSTBL=syscall.tbl
+TARGET_ALIGNED_ONLY=y
+TARGET_WORDS_BIGENDIAN=y

diff --git a/configs/targets/sparc-softmmu.mak b/configs/targets/sparc-softmmu.mak
new file mode 100644 (file)
index 0000000..9ba3d7b
--- /dev/null
+++ b/configs/targets/sparc-softmmu.mak
@@ -0,0 +1,3 @@
+TARGET_ARCH=sparc
+TARGET_ALIGNED_ONLY=y
+TARGET_WORDS_BIGENDIAN=y

diff --git a/configs/targets/sparc32plus-linux-user.mak b/configs/targets/sparc32plus-linux-user.mak
new file mode 100644 (file)
index 0000000..e4c51df
--- /dev/null
+++ b/configs/targets/sparc32plus-linux-user.mak
@@ -0,0 +1,8 @@
+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/configs/targets/sparc64-linux-user.mak b/configs/targets/sparc64-linux-user.mak
new file mode 100644 (file)
index 0000000..9d23ab4
--- /dev/null
+++ b/configs/targets/sparc64-linux-user.mak
@@ -0,0 +1,7 @@
+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/configs/targets/sparc64-softmmu.mak b/configs/targets/sparc64-softmmu.mak
new file mode 100644 (file)
index 0000000..8dd3217
--- /dev/null
+++ b/configs/targets/sparc64-softmmu.mak
@@ -0,0 +1,4 @@
+TARGET_ARCH=sparc64
+TARGET_BASE_ARCH=sparc
+TARGET_ALIGNED_ONLY=y
+TARGET_WORDS_BIGENDIAN=y

diff --git a/configs/targets/tricore-softmmu.mak b/configs/targets/tricore-softmmu.mak
new file mode 100644 (file)
index 0000000..96b10af
--- /dev/null
+++ b/configs/targets/tricore-softmmu.mak
@@ -0,0 +1 @@
+TARGET_ARCH=tricore

diff --git a/configs/targets/x86_64-bsd-user.mak b/configs/targets/x86_64-bsd-user.mak
new file mode 100644 (file)
index 0000000..799cd4a
--- /dev/null
+++ b/configs/targets/x86_64-bsd-user.mak
@@ -0,0 +1,3 @@
+TARGET_ARCH=x86_64
+TARGET_BASE_ARCH=i386
+TARGET_XML_FILES= gdb-xml/i386-64bit.xml

diff --git a/configs/targets/x86_64-linux-user.mak b/configs/targets/x86_64-linux-user.mak
new file mode 100644 (file)
index 0000000..9ceefbb
--- /dev/null
+++ b/configs/targets/x86_64-linux-user.mak
@@ -0,0 +1,5 @@
+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/configs/targets/x86_64-softmmu.mak b/configs/targets/x86_64-softmmu.mak
new file mode 100644 (file)
index 0000000..75e42bc
--- /dev/null
+++ b/configs/targets/x86_64-softmmu.mak
@@ -0,0 +1,4 @@
+TARGET_ARCH=x86_64
+TARGET_BASE_ARCH=i386
+TARGET_SUPPORTS_MTTCG=y
+TARGET_XML_FILES= gdb-xml/i386-64bit.xml

diff --git a/configs/targets/xtensa-linux-user.mak b/configs/targets/xtensa-linux-user.mak
new file mode 100644 (file)
index 0000000..420b30a
--- /dev/null
+++ b/configs/targets/xtensa-linux-user.mak
@@ -0,0 +1,4 @@
+TARGET_ARCH=xtensa
+TARGET_SYSTBL_ABI=common
+TARGET_SYSTBL=syscall.tbl
+TARGET_HAS_BFLT=y

diff --git a/configs/targets/xtensa-softmmu.mak b/configs/targets/xtensa-softmmu.mak
new file mode 100644 (file)
index 0000000..f075557
--- /dev/null
+++ b/configs/targets/xtensa-softmmu.mak
@@ -0,0 +1,2 @@
+TARGET_ARCH=xtensa
+TARGET_SUPPORTS_MTTCG=y

diff --git a/configs/targets/xtensaeb-linux-user.mak b/configs/targets/xtensaeb-linux-user.mak
new file mode 100644 (file)
index 0000000..1ea0f1b
--- /dev/null
+++ b/configs/targets/xtensaeb-linux-user.mak
@@ -0,0 +1,5 @@
+TARGET_ARCH=xtensa
+TARGET_SYSTBL_ABI=common
+TARGET_SYSTBL=syscall.tbl
+TARGET_WORDS_BIGENDIAN=y
+TARGET_HAS_BFLT=y

diff --git a/configs/targets/xtensaeb-softmmu.mak b/configs/targets/xtensaeb-softmmu.mak
new file mode 100644 (file)
index 0000000..405cf5a
--- /dev/null
+++ b/configs/targets/xtensaeb-softmmu.mak
@@ -0,0 +1,3 @@
+TARGET_ARCH=xtensa
+TARGET_WORDS_BIGENDIAN=y
+TARGET_SUPPORTS_MTTCG=y

diff --git a/configure b/configure
index a04b1e075c7aad4c73a0caad0b14b24f28885b9b..4eba89f823ea84a1d8c275aa9d98de00577ed0b9 100755 (executable)
--- a/configure
+++ b/configure
@@ -1677,13 +1677,13 @@ deprecated_features=""
 mak_wilds=""
 
 if [ "$softmmu" = "yes" ]; then
-    mak_wilds="${mak_wilds} $source_path/default-configs/targets/*-softmmu.mak"
+    mak_wilds="${mak_wilds} $source_path/configs/targets/*-softmmu.mak"
 fi
 if [ "$linux_user" = "yes" ]; then
-    mak_wilds="${mak_wilds} $source_path/default-configs/targets/*-linux-user.mak"
+    mak_wilds="${mak_wilds} $source_path/configs/targets/*-linux-user.mak"
 fi
 if [ "$bsd_user" = "yes" ]; then
-    mak_wilds="${mak_wilds} $source_path/default-configs/targets/*-bsd-user.mak"
+    mak_wilds="${mak_wilds} $source_path/configs/targets/*-bsd-user.mak"
 fi
 
 # If the user doesn't explicitly specify a deprecated target we will

diff --git a/default-configs/devices/aarch64-softmmu.mak b/default-configs/devices/aarch64-softmmu.mak
deleted file mode 100644 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
index f7e48c7..0000000
--- 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 (file)
index 4713253..0000000
--- 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 (file)
index 7703127..0000000
--- 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 (file)
index fae8315..0000000
--- 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 (file)
index 7e62fd7..0000000
--- 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 (file)
index e4b874a..0000000
--- 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 (file)
index e741ffd..0000000
--- 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 (file)
index 84a98f4..0000000
--- 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 (file)
index 255e44e..0000000
--- 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 (file)
index e3f921c..0000000
--- 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 (file)
index e483c42..0000000
--- 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 (file)
index e483c42..0000000
--- 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 (file)
index 003ed0a..0000000
--- 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 (file)
index f01e0a7..0000000
--- 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 (file)
index e3e71eb..0000000
--- 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 (file)
index 0283bb6..0000000
--- 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 (file)
index 5b2546a..0000000
--- 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 (file)
index 5babf71..0000000
--- 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 (file)
index 805d16c..0000000
--- 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 (file)
index 5df1a2b..0000000
--- 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 (file)
index 2a25bf2..0000000
--- 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 (file)
index 33f2a00..0000000
--- 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 (file)
index d0e775d..0000000
--- 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 (file)
index af40391..0000000
--- 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 (file)
index 19f5779..0000000
--- 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 (file)
index 8a49999..0000000
--- 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 (file)
index 32fd1ac..0000000
--- 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 (file)
index ece25b9..0000000
--- 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 (file)
index f348f35..0000000
--- 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 (file)
index 5a52aa4..0000000
--- 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 (file)
index e237930..0000000
--- 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 (file)
index c7c41f4..0000000
--- 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 (file)
index b8c2441..0000000
--- 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 (file)
index f31a9c3..0000000
--- 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 (file)
index 9a372f0..0000000
--- 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 (file)
index 9a372f0..0000000
--- 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 (file)
index 1dfb93e..0000000
--- 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 (file)
index 1dfb93e..0000000
--- 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 (file)
index ca4187e..0000000
--- 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 (file)
index f4eef18..0000000
--- 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 (file)
index 3133346..0000000
--- 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 (file)
index 84fbf46..0000000
--- 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 (file)
index 0945451..0000000
--- 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 (file)
index 426d5a2..0000000
--- 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 (file)
index bd2f1fd..0000000
--- 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 (file)
index d8b71cd..0000000
--- 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 (file)
index 4aca766..0000000
--- 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 (file)
index 7c0e7ee..0000000
--- 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 (file)
index 0c458b2..0000000
--- 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 (file)
index 9e31ce6..0000000
--- 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 (file)
index fd9fbd8..0000000
--- 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 (file)
index 0152d66..0000000
--- 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 (file)
index 9589637..0000000
--- 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 (file)
index 9b6fb4c..0000000
--- 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 (file)
index 382e9a8..0000000
--- 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 (file)
index 53dc7aa..0000000
--- 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 (file)
index 9ba3d7b..0000000
--- 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 (file)
index e4c51df..0000000
--- 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 (file)
index 9d23ab4..0000000
--- 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 (file)
index 8dd3217..0000000
--- 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 (file)
index 96b10af..0000000
--- 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 (file)
index 799cd4a..0000000
--- 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 (file)
index 9ceefbb..0000000
--- 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 (file)
index 75e42bc..0000000
--- 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 (file)
index 420b30a..0000000
--- 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 (file)
index f075557..0000000
--- 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 (file)
index 1ea0f1b..0000000
--- 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 (file)
index 405cf5a..0000000
--- a/default-configs/targets/xtensaeb-softmmu.mak
+++ /dev/null
@@ -1,3 +0,0 @@
-TARGET_ARCH=xtensa
-TARGET_WORDS_BIGENDIAN=y
-TARGET_SUPPORTS_MTTCG=y

diff --git a/meson.build b/meson.build
index d82f7a789d1a179d1c44a2885955479c18feea57..71c7462e89c87ec6e1c141008330d8fba8cef329 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1549,7 +1549,7 @@ foreach target : target_dirs
   endif
 
   actual_target_dirs += target
-  config_target += keyval.load('default-configs/targets' / target + '.mak')
+  config_target += keyval.load('configs/targets' / target + '.mak')
   config_target += { 'TARGET_' + config_target['TARGET_ARCH'].to_upper(): 'y' }
 
   if 'TARGET_NEED_FDT' in config_target
@@ -1597,7 +1597,7 @@ foreach target : target_dirs
   if target.endswith('-softmmu')
     config_devices_mak = target + '-config-devices.mak'
     config_devices_mak = configure_file(
-      input: ['default-configs/devices' / target + '.mak', 'Kconfig'],
+      input: ['configs/devices' / target / 'default.mak', 'Kconfig'],
       output: config_devices_mak,
       depfile: config_devices_mak + '.d',
       capture: true,

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 8f220e15d13da94ae68305e2c1a62a5a41372a7d..e4dcb17329a78c1afae7da8aba2ff81302cc0573 100644 (file)
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -36,7 +36,7 @@ export SRC_PATH
 
 # Get the list of all supported sysemu targets
 SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \
-   $(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak)))
+   $(wildcard $(SRC_PATH)/configs/*-softmmu.mak)))
 
 SPEED = quick