From d1a95ef4ace6b0106d7ee71f3d9e3e57c374df67 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 29 Jan 2019 12:16:26 +0100 Subject: [PATCH] alpha-softmmu.mak: express dependencies with Kconfig %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 19 +++++++------------ hw/alpha/Kconfig | 10 ++++++++++ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak index 762e3a29ab..d186fe8e9b 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -1,15 +1,10 @@ # Default configuration for alpha-softmmu -CONFIG_PCI=y -CONFIG_PCI_DEVICES=y -CONFIG_I82374=y -CONFIG_I8254=y -CONFIG_PCKBD=y -CONFIG_VGA_CIRRUS=y -CONFIG_VMWARE_VGA=y -CONFIG_IDE_CMD646=y -CONFIG_I8259=y -CONFIG_MC146818RTC=y -CONFIG_TEST_DEVICES=y -CONFIG_SMC37C669=y +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_PCI_DEVICES=n +#CONFIG_TEST_DEVICES=n + +# Boards: +# CONFIG_DP264=y diff --git a/hw/alpha/Kconfig b/hw/alpha/Kconfig index c5d0438a11..22cefd9577 100644 --- a/hw/alpha/Kconfig +++ b/hw/alpha/Kconfig @@ -1,2 +1,12 @@ config DP264 bool + imply PCI_DEVICES + imply TEST_DEVICES + select I82374 + select I8254 + select I8259 + select IDE_CMD646 + select MC146818RTC + select PCI + select PCKBD + select SMC37C669