system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-07-22 10:55:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Kconfig patches queue

Browse source 
Various Kconfig patches collected during v6.1 development cycle.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmD3EdQACgkQ4+MsLN6t
 wN5NkRAAuOm2BnMNzmtQ+Xv25KHNIWo5SmAx6oZh8so5WBLNsDtHIJBb83A50ypG
 OzVtTU0GZ934oH//2ZgVt6f6RKUQjtKoerqbJus5FWYYGg0+rL6b4bZ9Z9e7DSRo
 n/n1LKbbhHmNP/4Qwa4JA/CQJsvtUEloLMvj9LjHlfV8d+4A3t6RXRS2HU79sD7F
 BkB3jjPO2ixSbUaddXkRjldiQ0VRKBONTTyVcpw2DWKtWJhaVtbyYdcV/MNJzOyV
 /DqcaBBGxZ6RVRXJaJrH1rfH5micJP94RfHzshB5uO+x1dBzLLdD2lXWADSJ5C7A
 F6/lm+ut8s2V+VXMEyHrtGOC1uebxZVC1C/OLRoc+6ifhln/V1yI3qc9CG7/VAfT
 1Nz0PjYEFLg1DaE/4mgnIMwFtKEc6wpmJXxLkq91VRdSXN5A2XnhzjGFmwCJ6M4Q
 pCrUJwdj86Y4lVa3xnUsAT60qLd3P3Ysqm4FYk1RpLmfPeBhjsFg7p7teHXCpTHa
 1tUPM2UslVz2obXhL4MU2KKWD6Pt5b8Boq4kCB/5O4ekBNzLC1eHT2aQAXUG1lps
 B3NyWmvUscd6sh5f0fX/Gi94RhyzFUr4+H8nsLmZeBE37S+y2rIseG+/qDG/+KKU
 F46XwhJYs3TM829zHEQGwe/ZxyafOK9y/pXnQ+8BZCZL+4jQVjs=
 =lzI3
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/philmd/tags/kconfig-20210720' into staging

Kconfig patches queue

Various Kconfig patches collected during v6.1 development cycle.

# gpg: Signature made Tue 20 Jul 2021 19:11:32 BST
# gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* remotes/philmd/tags/kconfig-20210720:
  hw/tricore: fix inclusion of tricore_testboard
  hw/ppc/Kconfig: Add dependency PEGASOS2 -> ATI_VGA
  hw/isa/vt82c686: Add missing Kconfig dependency (runtime error)
  hw/isa/vt82c686: Add missing Kconfig dependencies (build error)
  hw/pci-host/Kconfig: Add missing dependency MV64361 -> I8259
  hw/ppc/Kconfig: Add missing dependency E500 -> DS1338 RTC
  hw/riscv/Kconfig: Restrict NUMA to Virt & Spike machines
  hw/riscv/Kconfig: Add missing dependency MICROCHIP_PFSOC -> SERIAL
  hw/arm/Kconfig: Add missing SDHCI symbol to FSL_IMX25
  hw/arm/Kconfig: Remove unused DS1338 symbol from i.MX25 PDK Board
  hw/arm/Kconfig: Add missing dependency NPCM7XX -> SMBUS
  hw/ide/Kconfig: Add missing dependency PCI -> IDE_QDEV
  hw/i386/Kconfig: Add missing Kconfig dependency (runtime error)
  hw/acpi/Kconfig: Add missing Kconfig dependencies (build error)
  hw/acpi: Do not restrict ACPI core routines to x86 architecture
  hw/mips: Express dependencies of the Boston machine with Kconfig
  hw/mips: Add dependency MIPS_CPS -> MIPS_ITU

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2021-07-20 19:30:28 +01:00
parent c04b4d9e6b 8ea7543865
commit 801f3db756
17 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configs/devices/mips64el-softmmu/default.mak
View file

@ -8,8 +8,4 @@ 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

1
configs/devices/ppc-softmmu/default.mak
View file

@ -1,7 +1,6 @@
# Default configuration for ppc-softmmu
# For embedded PPCs:
CONFIG_DS1338=y
CONFIG_E500=y
CONFIG_PPC405=y
CONFIG_PPC440=y

1
configs/devices/tricore-softmmu/default.mak
View file

@ -1 +1,2 @@
CONFIG_TRICORE_TESTBOARD=y
CONFIG_TRIBOARD=y

4
hw/acpi/Kconfig
View file

@ -42,3 +42,7 @@ config ACPI_VMGENID
depends on PC
config ACPI_HW_REDUCED
bool
select ACPI
select ACPI_MEMORY_HOTPLUG
select ACPI_NVDIMM

3
hw/acpi/meson.build
View file

@ -3,6 +3,7 @@ acpi_ss.add(files(
'acpi_interface.c',
'aml-build.c',
'bios-linker-loader.c',
'core.c',
'utils.c',
))
acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu.c'))
@ -14,7 +15,7 @@ acpi_ss.add(when: 'CONFIG_ACPI_VMGENID', if_true: files('vmgenid.c'))
acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('generic_event_device.c'))
acpi_ss.add(when: 'CONFIG_ACPI_HMAT', if_true: files('hmat.c'))
acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c'), if_false: files('ghes-stub.c'))
acpi_ss.add(when: 'CONFIG_ACPI_X86', if_true: files('core.c', 'piix4.c', 'pcihp.c'), if_false: files('acpi-stub.c'))
acpi_ss.add(when: 'CONFIG_ACPI_X86', if_true: files('piix4.c', 'pcihp.c'))
acpi_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('ich9.c', 'tco.c'))
acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'), if_false: files('ipmi-stub.c'))
acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c'))

3
hw/arm/Kconfig
View file

@ -388,6 +388,7 @@ config NPCM7XX
select A9MPCORE
select ADM1272
select ARM_GIC
select SMBUS
select AT24C # EEPROM
select MAX34451
select PL310 # cache controller
@ -403,7 +404,7 @@ config FSL_IMX25
select IMX_FEC
select IMX_I2C
select WDT_IMX2
select DS1338
select SDHCI
config FSL_IMX31
bool

1
hw/char/Kconfig
View file

@ -61,6 +61,7 @@ config AVR_USART
config MCHP_PFSOC_MMUART
bool
select SERIAL
config SIFIVE_UART
bool

1
hw/i386/Kconfig
View file

@ -111,6 +111,7 @@ config MICROVM
select ACPI_HW_REDUCED
select PCI_EXPRESS_GENERIC_BRIDGE
select USB_XHCI_SYSBUS
select I8254
config X86_IOMMU
bool

2
hw/ide/Kconfig
View file

@ -8,7 +8,7 @@ config IDE_QDEV
config IDE_PCI
bool
depends on PCI
select IDE_CORE
select IDE_QDEV
config IDE_ISA
bool

5
hw/isa/Kconfig
View file

@ -50,6 +50,11 @@ config VT82C686
select FDC_ISA
select USB_UHCI
select APM
select I8254
select I8257
select I8259
select MC146818RTC
select PARALLEL
config SMC37C669
bool

6
hw/mips/Kconfig
View file

@ -47,9 +47,15 @@ config LOONGSON3V
config MIPS_CPS
bool
select PTIMER
select MIPS_ITU
config MIPS_BOSTON
bool
select FITLOADER
select MIPS_CPS
select PCI_EXPRESS_XILINX
select AHCI_ICH9
select SERIAL
config FW_CFG_MIPS
bool

1
hw/pci-host/Kconfig
View file

@ -76,3 +76,4 @@ config SH_PCI
config MV64361
bool
select PCI
select I8259

2
hw/ppc/Kconfig
View file

@ -79,6 +79,7 @@ config PEGASOS2
select VOF
# This should come with VT82C686
select ACPI_X86
imply ATI_VGA
config PREP
bool
@ -130,6 +131,7 @@ config E500
select SERIAL
select MPC_I2C
select FDT_PPC
select DS1338
config VIRTEX
bool

5
hw/riscv/Kconfig
View file

@ -1,3 +1,6 @@
config RISCV_NUMA
bool
config IBEX
bool
@ -34,6 +37,7 @@ config RISCV_VIRT
imply PCI_DEVICES
imply VIRTIO_VGA
imply TEST_DEVICES
select RISCV_NUMA
select GOLDFISH_RTC
select MSI_NONBROKEN
select PCI
@ -74,6 +78,7 @@ config SIFIVE_U
config SPIKE
bool
select RISCV_NUMA
select HTIF
select MSI_NONBROKEN
select SIFIVE_CLINT

2
hw/riscv/meson.build
View file

@ -1,6 +1,6 @@
riscv_ss = ss.source_set()
riscv_ss.add(files('boot.c'), fdt)
riscv_ss.add(files('numa.c'))
riscv_ss.add(when: 'CONFIG_RISCV_NUMA', if_true: files('numa.c'))
riscv_ss.add(files('riscv_hart.c'))
riscv_ss.add(when: 'CONFIG_OPENTITAN', if_true: files('opentitan.c'))
riscv_ss.add(when: 'CONFIG_RISCV_VIRT', if_true: files('virt.c'))

3
hw/tricore/Kconfig
View file

@ -1,9 +1,8 @@
config TRICORE
config TRICORE_TESTBOARD
bool
config TRIBOARD
bool
select TRICORE
select TC27X_SOC
config TC27X_SOC

4
hw/tricore/meson.build
View file

@ -1,6 +1,6 @@
tricore_ss = ss.source_set()
tricore_ss.add(when: 'CONFIG_TRICORE', if_true: files('tricore_testboard.c'))
tricore_ss.add(when: 'CONFIG_TRICORE', if_true: files('tricore_testdevice.c'))
tricore_ss.add(when: 'CONFIG_TRICORE_TESTBOARD', if_true: files('tricore_testboard.c'))
tricore_ss.add(when: 'CONFIG_TRICORE_TESTBOARD', if_true: files('tricore_testdevice.c'))
tricore_ss.add(when: 'CONFIG_TRIBOARD', if_true: files('triboard.c'))
tricore_ss.add(when: 'CONFIG_TC27X_SOC', if_true: files('tc27x_soc.c'))