From 9483cf27dd363926b59ee3a9c117538c834beb4e Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 29 Jan 2019 15:04:49 +0100 Subject: [PATCH] hppa-softmmu.mak: express dependencies with Kconfig %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Note that the Dino board uses a memory mapped 16550 UART and therefore only CONFIG_SERIAL is needed, not CONFIG_SERIAL_ISA. Signed-off-by: Paolo Bonzini --- default-configs/hppa-softmmu.mak | 20 ++++++++------------ hw/hppa/Kconfig | 8 ++++++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmmu.mak index b7f2b43c24..b64c5eb3ff 100644 --- a/default-configs/hppa-softmmu.mak +++ b/default-configs/hppa-softmmu.mak @@ -1,13 +1,9 @@ -CONFIG_PCI=y -CONFIG_PCI_DEVICES=y -CONFIG_SERIAL=y -CONFIG_SERIAL_ISA=y -CONFIG_ISA_BUS=y -CONFIG_I8259=y -CONFIG_E1000_PCI=y -CONFIG_IDE_CMD646=y -# CONFIG_IDE_MMIO=y -CONFIG_LSI_SCSI_PCI=y -CONFIG_VIRTIO_VGA=y -CONFIG_MC146818RTC=y +# Default configuration for hppa-softmmu + +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_PCI_DEVICES=n + +# Boards: +# CONFIG_DINO=y diff --git a/hw/hppa/Kconfig b/hw/hppa/Kconfig index 5ce48ef940..2d9b072c21 100644 --- a/hw/hppa/Kconfig +++ b/hw/hppa/Kconfig @@ -1,2 +1,10 @@ config DINO bool + imply PCI_DEVICES + select PCI + select SERIAL + select ISA_BUS + select I8259 + select IDE_CMD646 + select MC146818RTC + select LSI_SCSI_PCI -- 2.42.0