aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2019-01-29 15:04:49 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2019-03-07 21:46:19 +0100
commit9483cf27dd363926b59ee3a9c117538c834beb4e (patch)
treecd54e79df13660f6d44ea2e5f9202adc342efd28
parent23c95f06feef52b0cec75af20828c36b4c98cb4d (diff)
downloadqemu-9483cf27dd363926b59ee3a9c117538c834beb4e.zip
qemu-9483cf27dd363926b59ee3a9c117538c834beb4e.tar.gz
qemu-9483cf27dd363926b59ee3a9c117538c834beb4e.tar.bz2
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 <pbonzini@redhat.com>
-rw-r--r--default-configs/hppa-softmmu.mak20
-rw-r--r--hw/hppa/Kconfig8
2 files changed, 16 insertions, 12 deletions
diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmmu.mak
index b7f2b43..b64c5eb 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 5ce48ef..2d9b072 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