mips: do not list individual devices from configs/
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:
parent
44a90c0875
commit
9ed7c6dd9f
@ -659,7 +659,7 @@ build-without-defaults:
|
|||||||
--disable-pie
|
--disable-pie
|
||||||
--disable-qom-cast-debug
|
--disable-qom-cast-debug
|
||||||
--disable-strip
|
--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
|
sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user
|
||||||
MAKE_CHECK_ARGS: check
|
MAKE_CHECK_ARGS: check
|
||||||
|
|
||||||
|
@ -1,28 +1,8 @@
|
|||||||
# Common mips*-softmmu CONFIG defines
|
# Common mips*-softmmu CONFIG defines
|
||||||
|
|
||||||
CONFIG_ISA_BUS=y
|
# Uncomment the following lines to disable these optional devices:
|
||||||
CONFIG_PCI=y
|
# CONFIG_PCI_DEVICES=n
|
||||||
CONFIG_PCI_DEVICES=y
|
# CONFIG_TEST_DEVICES=n
|
||||||
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
|
|
||||||
CONFIG_MALTA=y
|
CONFIG_MALTA=y
|
||||||
CONFIG_PCNET_PCI=y
|
|
||||||
CONFIG_MIPSSIM=y
|
CONFIG_MIPSSIM=y
|
||||||
CONFIG_SMBUS_EEPROM=y
|
|
||||||
CONFIG_TEST_DEVICES=y
|
|
||||||
|
@ -3,8 +3,5 @@
|
|||||||
include ../mips-softmmu/common.mak
|
include ../mips-softmmu/common.mak
|
||||||
CONFIG_FULOONG=y
|
CONFIG_FULOONG=y
|
||||||
CONFIG_LOONGSON3V=y
|
CONFIG_LOONGSON3V=y
|
||||||
CONFIG_ATI_VGA=y
|
|
||||||
CONFIG_RTL8139_PCI=y
|
|
||||||
CONFIG_JAZZ=y
|
CONFIG_JAZZ=y
|
||||||
CONFIG_VT82C686=y
|
|
||||||
CONFIG_MIPS_BOSTON=y
|
CONFIG_MIPS_BOSTON=y
|
||||||
|
@ -55,7 +55,7 @@ config VGA_MMIO
|
|||||||
|
|
||||||
config VMWARE_VGA
|
config VMWARE_VGA
|
||||||
bool
|
bool
|
||||||
default y if PCI_DEVICES && PC_PCI
|
default y if PCI_DEVICES && (PC_PCI || MIPS)
|
||||||
depends on PCI
|
depends on PCI
|
||||||
select VGA
|
select VGA
|
||||||
|
|
||||||
|
@ -1,8 +1,15 @@
|
|||||||
config MALTA
|
config MALTA
|
||||||
bool
|
bool
|
||||||
|
imply PCNET_PCI
|
||||||
|
imply PCI_DEVICES
|
||||||
|
imply TEST_DEVICES
|
||||||
select FDC37M81X
|
select FDC37M81X
|
||||||
select GT64120
|
select GT64120
|
||||||
|
select MIPS_CPS
|
||||||
select PIIX
|
select PIIX
|
||||||
|
select PFLASH_CFI01
|
||||||
|
select SERIAL
|
||||||
|
select SMBUS_EEPROM
|
||||||
|
|
||||||
config MIPSSIM
|
config MIPSSIM
|
||||||
bool
|
bool
|
||||||
@ -31,17 +38,26 @@ config JAZZ
|
|||||||
|
|
||||||
config FULOONG
|
config FULOONG
|
||||||
bool
|
bool
|
||||||
|
imply PCI_DEVICES
|
||||||
|
imply TEST_DEVICES
|
||||||
|
imply ATI_VGA
|
||||||
|
imply RTL8139_PCI
|
||||||
select PCI_BONITO
|
select PCI_BONITO
|
||||||
|
select SMBUS_EEPROM
|
||||||
select VT82C686
|
select VT82C686
|
||||||
|
|
||||||
config LOONGSON3V
|
config LOONGSON3V
|
||||||
bool
|
bool
|
||||||
|
imply PCI_DEVICES
|
||||||
|
imply TEST_DEVICES
|
||||||
|
imply VIRTIO_PCI
|
||||||
|
imply VIRTIO_NET
|
||||||
imply VIRTIO_VGA
|
imply VIRTIO_VGA
|
||||||
imply QXL if SPICE
|
imply QXL if SPICE
|
||||||
|
imply USB_OHCI_PCI
|
||||||
select SERIAL
|
select SERIAL
|
||||||
select GOLDFISH_RTC
|
select GOLDFISH_RTC
|
||||||
select LOONGSON_LIOINTC
|
select LOONGSON_LIOINTC
|
||||||
select PCI_DEVICES
|
|
||||||
select PCI_EXPRESS_GENERIC_BRIDGE
|
select PCI_EXPRESS_GENERIC_BRIDGE
|
||||||
select MSI_NONBROKEN
|
select MSI_NONBROKEN
|
||||||
select FW_CFG_MIPS
|
select FW_CFG_MIPS
|
||||||
@ -53,6 +69,8 @@ config MIPS_CPS
|
|||||||
|
|
||||||
config MIPS_BOSTON
|
config MIPS_BOSTON
|
||||||
bool
|
bool
|
||||||
|
imply PCI_DEVICES
|
||||||
|
imply TEST_DEVICES
|
||||||
select FITLOADER
|
select FITLOADER
|
||||||
select MIPS_CPS
|
select MIPS_CPS
|
||||||
select PCI_EXPRESS_XILINX
|
select PCI_EXPRESS_XILINX
|
||||||
|
Loading…
Reference in New Issue
Block a user