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>
This commit is contained in:
Alex Bennée
Paolo Bonzini
parent
cd43648a44
commit
812b31d3f9
22
MAINTAINERS
22
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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Default configuration for aarch64-softmmu
|
||||
|
||||
# We support all the 32 bit boards so need all their config
|
||||
include arm-softmmu.mak
|
||||
include ../arm-softmmu/default.mak
|
||||
|
||||
CONFIG_XLNX_ZYNQMP_ARM=y
|
||||
CONFIG_XLNX_VERSAL=y
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
# Default configuration for microblazeel-softmmu
|
||||
|
||||
include microblaze-softmmu.mak
|
||||
include ../microblaze-softmmu/default.mak
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
# Default configuration for mips-softmmu
|
||||
|
||||
include mips-softmmu-common.mak
|
||||
include common.mak
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# Default configuration for mips64-softmmu
|
||||
|
||||
include mips-softmmu-common.mak
|
||||
include ../mips-softmmu/common.mak
|
||||
CONFIG_JAZZ=y
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Default configuration for mips64el-softmmu
|
||||
|
||||
include mips-softmmu-common.mak
|
||||
include ../mips-softmmu/common.mak
|
||||
CONFIG_IDE_VIA=y
|
||||
CONFIG_FULOONG=y
|
||||
CONFIG_LOONGSON3V=y
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
# Default configuration for mipsel-softmmu
|
||||
|
||||
include mips-softmmu-common.mak
|
||||
include ../mips-softmmu/common.mak
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Default configuration for ppc64-softmmu
|
||||
|
||||
# Include all 32-bit boards
|
||||
include ppc-softmmu.mak
|
||||
include ../ppc-softmmu/default.mak
|
||||
|
||||
# For PowerNV
|
||||
CONFIG_POWERNV=y
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
# Default configuration for sh4eb-softmmu
|
||||
|
||||
include sh4-softmmu.mak
|
||||
include ../sh4-softmmu/default.mak
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
# Default configuration for x86_64-softmmu
|
||||
|
||||
include i386-softmmu.mak
|
||||
include ../i386-softmmu/default.mak
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# Default configuration for Xtensa
|
||||
|
||||
include ../xtensa-softmmu/default.mak
|
||||
|
|
@ -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
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue