From 12bb3a90088ed427ac5e6a974c5f93a3106fc4cf Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Thu, 31 Jan 2019 14:53:27 +0100 Subject: [PATCH] ppc: Express dependencies of the 'prep' and '40p' machines with kconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Select the required devices in hw/ppc/Kconfig instead, so that ppc-softmmu.mak only contains the user-selectable PREP switch. Plug-in devices like NE2000_ISA are pulled in automatically by the Kconfig build system now. Cc: Hervé Poussineau Signed-off-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/ppc-softmmu.mak | 8 -------- hw/ppc/Kconfig | 10 ++++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index 9ad307a025..066cec9845 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -55,11 +55,3 @@ CONFIG_MAC_NEWWORLD=y # For PReP CONFIG_PREP=y -CONFIG_PREP_PCI=y -CONFIG_RS6000_MC=y -CONFIG_I82374=y -CONFIG_I82378=y -CONFIG_PCKBD=y -CONFIG_NE2000_ISA=y -CONFIG_PC87312=y -CONFIG_CS4231A=y diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 32559e8b6d..78b0d92eba 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -39,6 +39,16 @@ config SAM460EX config PREP bool + imply PCI_DEVICES + imply TEST_DEVICES + select CS4231A + select PREP_PCI + select I82374 + select I82378 + select LSI_SCSI_PCI + select M48T59 + select PC87312 + select RS6000_MC config RS6000_MC bool