mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mips: switch boards to "default y" 

Some targets use "default y" for boards to filter out those that require
TCG.  For consistency we are switching all other targets to do the same.
Continue with MIPS.

No changes to generated config-devices.mak file.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-01-25 13:36:37 +01:00
parent bae3e3a5c6
commit 8a1f6d0ebd
5 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.d/buildtest.yml
View File

@ -649,7 +649,7 @@ build-tci:
# Check our reduced build configurations # Check our reduced build configurations
# requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel, # requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel,
# x86_64 # mips64el, x86_64
# does not build without boards: i386, loongarch64, x86_64 # does not build without boards: i386, loongarch64, x86_64
build-without-defaults: build-without-defaults:
extends: .native_build_job_template extends: .native_build_job_template
@ -665,6 +665,7 @@ build-without-defaults:
--disable-qom-cast-debug --disable-qom-cast-debug
--disable-strip --disable-strip
TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu m68k-softmmu TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu m68k-softmmu
mips-softmmu mips64-softmmu mipsel-softmmu
s390x-softmmu sh4-softmmu s390x-softmmu sh4-softmmu
sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check

5
configs/devices/mips-softmmu/common.mak
View File

@ -4,5 +4,6 @@
# CONFIG_PCI_DEVICES=n # CONFIG_PCI_DEVICES=n
# CONFIG_TEST_DEVICES=n # CONFIG_TEST_DEVICES=n
CONFIG_MALTA=y # Boards are selected by default, uncomment to keep out of the build.
CONFIG_MIPSSIM=y # CONFIG_MALTA=n
# CONFIG_MIPSSIM=n

4
configs/devices/mips64-softmmu/default.mak
View File

@ -1,4 +1,6 @@
# Default configuration for mips64-softmmu # Default configuration for mips64-softmmu
include ../mips-softmmu/common.mak include ../mips-softmmu/common.mak
CONFIG_JAZZ=y
# Boards are selected by default, uncomment to keep out of the build.
# CONFIG_JAZZ=n

10
configs/devices/mips64el-softmmu/default.mak
View File

@ -1,7 +1,9 @@
# Default configuration for mips64el-softmmu # Default configuration for mips64el-softmmu
include ../mips-softmmu/common.mak include ../mips-softmmu/common.mak
CONFIG_FULOONG=y
CONFIG_LOONGSON3V=y # Boards are selected by default, uncomment to keep out of the build.
CONFIG_JAZZ=y # CONFIG_FULOONG=n
CONFIG_MIPS_BOSTON=y # CONFIG_LOONGSON3V=n
# CONFIG_JAZZ=n
# CONFIG_MIPS_BOSTON=n

12
hw/mips/Kconfig
View File

@ -1,5 +1,7 @@
config MALTA config MALTA
bool bool
default y
depends on MIPS
imply PCNET_PCI imply PCNET_PCI
imply PCI_DEVICES imply PCI_DEVICES
imply TEST_DEVICES imply TEST_DEVICES
@ -13,11 +15,15 @@ config MALTA
config MIPSSIM config MIPSSIM
bool bool
default y
depends on MIPS
select SERIAL select SERIAL
select MIPSNET select MIPSNET
config JAZZ config JAZZ
bool bool
default y
depends on MIPS64
select ISA_BUS select ISA_BUS
select RC4030 select RC4030
select I8259 select I8259
@ -38,6 +44,8 @@ config JAZZ
config FULOONG config FULOONG
bool bool
default y
depends on MIPS64 && !TARGET_BIG_ENDIAN
imply PCI_DEVICES imply PCI_DEVICES
imply TEST_DEVICES imply TEST_DEVICES
imply ATI_VGA imply ATI_VGA
@ -48,6 +56,8 @@ config FULOONG
config LOONGSON3V config LOONGSON3V
bool bool
default y
depends on MIPS64 && !TARGET_BIG_ENDIAN
imply PCI_DEVICES imply PCI_DEVICES
imply TEST_DEVICES imply TEST_DEVICES
imply VIRTIO_PCI imply VIRTIO_PCI
@ -69,6 +79,8 @@ config MIPS_CPS
config MIPS_BOSTON config MIPS_BOSTON
bool bool
default y
depends on MIPS64 && !TARGET_BIG_ENDIAN
imply PCI_DEVICES imply PCI_DEVICES
imply TEST_DEVICES imply TEST_DEVICES
select FITLOADER select FITLOADER