Skip to content

Commit 801f3db

Browse files
pm215pm215
committed
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>
2 parents c04b4d9 + 8ea7543 commit 801f3db

17 files changed

Lines changed: 35 additions & 13 deletions

File tree

‎configs/devices/mips64el-softmmu/default.mak‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,4 @@ CONFIG_ATI_VGA=y
88
CONFIG_RTL8139_PCI=y
99
CONFIG_JAZZ=y
1010
CONFIG_VT82C686=y
11-
CONFIG_AHCI=y
1211
CONFIG_MIPS_BOSTON=y
13-
CONFIG_FITLOADER=y
14-
CONFIG_PCI_EXPRESS=y
15-
CONFIG_PCI_EXPRESS_XILINX=y

‎configs/devices/ppc-softmmu/default.mak‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Default configuration for ppc-softmmu
22

33
# For embedded PPCs:
4-
CONFIG_DS1338=y
54
CONFIG_E500=y
65
CONFIG_PPC405=y
76
CONFIG_PPC440=y

‎configs/devices/tricore-softmmu/default.mak‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
CONFIG_TRICORE_TESTBOARD=y
12
CONFIG_TRIBOARD=y

‎hw/acpi/Kconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,7 @@ config ACPI_VMGENID
4242
depends on PC
4343

4444
config ACPI_HW_REDUCED
45+
bool
46+
select ACPI
47+
select ACPI_MEMORY_HOTPLUG
48+
select ACPI_NVDIMM

‎hw/acpi/meson.build‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ acpi_ss.add(files(
33
'acpi_interface.c',
44
'aml-build.c',
55
'bios-linker-loader.c',
6+
'core.c',
67
'utils.c',
78
))
89
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'))
1415
acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('generic_event_device.c'))
1516
acpi_ss.add(when: 'CONFIG_ACPI_HMAT', if_true: files('hmat.c'))
1617
acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c'), if_false: files('ghes-stub.c'))
17-
acpi_ss.add(when: 'CONFIG_ACPI_X86', if_true: files('core.c', 'piix4.c', 'pcihp.c'), if_false: files('acpi-stub.c'))
18+
acpi_ss.add(when: 'CONFIG_ACPI_X86', if_true: files('piix4.c', 'pcihp.c'))
1819
acpi_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('ich9.c', 'tco.c'))
1920
acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'), if_false: files('ipmi-stub.c'))
2021
acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c'))

‎hw/arm/Kconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@ config NPCM7XX
388388
select A9MPCORE
389389
select ADM1272
390390
select ARM_GIC
391+
select SMBUS
391392
select AT24C # EEPROM
392393
select MAX34451
393394
select PL310 # cache controller
@@ -403,7 +404,7 @@ config FSL_IMX25
403404
select IMX_FEC
404405
select IMX_I2C
405406
select WDT_IMX2
406-
select DS1338
407+
select SDHCI
407408

408409
config FSL_IMX31
409410
bool

‎hw/char/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ config AVR_USART
6161

6262
config MCHP_PFSOC_MMUART
6363
bool
64+
select SERIAL
6465

6566
config SIFIVE_UART
6667
bool

‎hw/i386/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ config MICROVM
111111
select ACPI_HW_REDUCED
112112
select PCI_EXPRESS_GENERIC_BRIDGE
113113
select USB_XHCI_SYSBUS
114+
select I8254
114115

115116
config X86_IOMMU
116117
bool

‎hw/ide/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ config IDE_QDEV
88
config IDE_PCI
99
bool
1010
depends on PCI
11-
select IDE_CORE
11+
select IDE_QDEV
1212

1313
config IDE_ISA
1414
bool

‎hw/isa/Kconfig‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ config VT82C686
5050
select FDC_ISA
5151
select USB_UHCI
5252
select APM
53+
select I8254
54+
select I8257
55+
select I8259
56+
select MC146818RTC
57+
select PARALLEL
5358

5459
config SMC37C669
5560
bool

0 commit comments

Comments
 (0)