From: Paolo Bonzini Date: Tue, 29 Jan 2019 11:16:27 +0000 (+0100) Subject: sparc-softmmu.mak: express dependencies with Kconfig X-Git-Tag: v4.0.0-rc0~52^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c75eec06d4f44977178d5f228058c6b696afe1c;p=thirdparty%2Fqemu.git sparc-softmmu.mak: express dependencies with Kconfig %-softmmu.mak only keep boards and optional device definitions in Kconfig mode. Signed-off-by: Paolo Bonzini --- diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak index b31a9f2d443..ee852181151 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -1,21 +1,11 @@ # Default configuration for sparc-softmmu -CONFIG_ISA_BUS=y -CONFIG_ECC=y -CONFIG_ESP=y -CONFIG_ESCC=y -CONFIG_M48T59=y -CONFIG_FDC=y -CONFIG_EMPTY_SLOT=y -CONFIG_PCNET_COMMON=y -CONFIG_LANCE=y -CONFIG_TCX=y -CONFIG_CG3=y -CONFIG_SLAVIO=y -CONFIG_CS4231=y -CONFIG_GRLIB=y -CONFIG_STP2000=y -CONFIG_ECCMEMCTL=y +# Uncomment the following lines to disable these optional devices: +# +#CONFIG_TCX=n +#CONFIG_CG3=n +# Boards: +# CONFIG_SUN4M=y CONFIG_LEON3=y diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index a012d2c94eb..2c60be99bc6 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -71,6 +71,7 @@ config IVSHMEM_DEVICE config ECCMEMCTL bool + select ECC config IMX bool diff --git a/hw/net/Kconfig b/hw/net/Kconfig index 6b4633b464d..c00ec03cd1c 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -77,6 +77,7 @@ config STELLARIS_ENET config LANCE bool + select PCNET_COMMON config SUNHME bool diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig index c9c21423047..2a83a8010eb 100644 --- a/hw/sparc/Kconfig +++ b/hw/sparc/Kconfig @@ -1,8 +1,21 @@ config SUN4M bool + imply TCX + imply CG3 + select CS4231 + select ECCMEMCTL + select EMPTY_SLOT + select ESCC + select ESP + select FDC + select SLAVIO + select LANCE + select M48T59 + select STP2000 config LEON3 bool + select GRLIB config GRLIB bool