OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

mips: do not list individual devices from configs/

Browse Source 
Add new "select" and "imply" directives if needed.  The resulting
config-devices.mak files are the same as before.
Builds without default devices will become much smaller
than before, and qtests fail (as expected, though suboptimal)
for mips64-softmmu because most tests do not use -nodefaults,
so remove it from build-without-defaults

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-01-29 14:21:36 +01:00
parent 44a90c0875
commit 9ed7c6dd9f
5 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -659,7 +659,7 @@ build-without-defaults:
--disable-pie
--disable-qom-cast-debug
--disable-strip
TARGETS: avr-softmmu mips64-softmmu s390x-softmmu sh4-softmmu
TARGETS: avr-softmmu s390x-softmmu sh4-softmmu
sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user
MAKE_CHECK_ARGS: check

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

@ -1,28 +1,8 @@
# Common mips*-softmmu CONFIG defines
CONFIG_ISA_BUS=y
CONFIG_PCI=y
CONFIG_PCI_DEVICES=y
CONFIG_VGA_ISA=y
CONFIG_VGA_MMIO=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_I8257=y
CONFIG_IDE_ISA=y
CONFIG_PFLASH_CFI01=y
CONFIG_I8259=y
CONFIG_MC146818RTC=y
CONFIG_MIPS_CPS=y
CONFIG_MIPS_ITU=y
# Uncomment the following lines to disable these optional devices:
# CONFIG_PCI_DEVICES=n
# CONFIG_TEST_DEVICES=n
CONFIG_MALTA=y
CONFIG_PCNET_PCI=y
CONFIG_MIPSSIM=y
CONFIG_SMBUS_EEPROM=y
CONFIG_TEST_DEVICES=y

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

@ -3,8 +3,5 @@
include ../mips-softmmu/common.mak
CONFIG_FULOONG=y
CONFIG_LOONGSON3V=y
CONFIG_ATI_VGA=y
CONFIG_RTL8139_PCI=y
CONFIG_JAZZ=y
CONFIG_VT82C686=y
CONFIG_MIPS_BOSTON=y

2
hw/display/Kconfig
View File

@ -55,7 +55,7 @@ config VGA_MMIO
config VMWARE_VGA
bool
default y if PCI_DEVICES && PC_PCI
default y if PCI_DEVICES && (PC_PCI || MIPS)
depends on PCI
select VGA

20
hw/mips/Kconfig
View File

@ -1,8 +1,15 @@
config MALTA
bool
imply PCNET_PCI
imply PCI_DEVICES
imply TEST_DEVICES
select FDC37M81X
select GT64120
select MIPS_CPS
select PIIX
select PFLASH_CFI01
select SERIAL
select SMBUS_EEPROM
config MIPSSIM
bool
@ -31,17 +38,26 @@ config JAZZ
config FULOONG
bool
imply PCI_DEVICES
imply TEST_DEVICES
imply ATI_VGA
imply RTL8139_PCI
select PCI_BONITO
select SMBUS_EEPROM
select VT82C686
config LOONGSON3V
bool
imply PCI_DEVICES
imply TEST_DEVICES
imply VIRTIO_PCI
imply VIRTIO_NET
imply VIRTIO_VGA
imply QXL if SPICE
imply USB_OHCI_PCI
select SERIAL
select GOLDFISH_RTC
select LOONGSON_LIOINTC
select PCI_DEVICES
select PCI_EXPRESS_GENERIC_BRIDGE
select MSI_NONBROKEN
select FW_CFG_MIPS
@ -53,6 +69,8 @@ config MIPS_CPS
config MIPS_BOSTON
bool
imply PCI_DEVICES
imply TEST_DEVICES
select FITLOADER
select MIPS_CPS
select PCI_EXPRESS_XILINX