Re: [Qemu-devel] [PATCH 47/51] sparc64-softmmu.mak: express dependencies with Kconfig

[Mark Cave-Ayland]

On 07/02/2019 17:57, Paolo Bonzini wrote:

> %-softmmu.mak only keep boards and optional device
> definitions in Kconfig mode.
> 
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
>  default-configs/sparc64-softmmu.mak | 23 ++++++++---------------
>  hw/sparc64/Kconfig                  | 13 +++++++++++++
>  2 files changed, 21 insertions(+), 15 deletions(-)
> 
> diff --git a/default-configs/sparc64-softmmu.mak 
> b/default-configs/sparc64-softmmu.mak
> index 528af8f..e50030a 100644
> --- a/default-configs/sparc64-softmmu.mak
> +++ b/default-configs/sparc64-softmmu.mak
> @@ -1,19 +1,12 @@
>  # Default configuration for sparc64-softmmu
>  
> -CONFIG_PCI=y
> -CONFIG_PCI_DEVICES=y
> -CONFIG_M48T59=y
> -CONFIG_SERIAL=y
> -CONFIG_SERIAL_ISA=y
> -CONFIG_PARALLEL=y
> -CONFIG_PCKBD=y
> -CONFIG_FDC=y
> -CONFIG_IDE_CMD646=y
> -CONFIG_PCI_SABRE=y
> -CONFIG_SIMBA=y
> -CONFIG_SUNHME=y
> -CONFIG_MC146818RTC=y
> -CONFIG_TEST_DEVICES=y
> -CONFIG_SUN4V_RTC=y
> +# Uncomment the following lines to disable these optional devices:
> +#
> +#CONFIG_PCI_DEVICES=n
> +#CONFIG_SUNHME=n

Again I'm not sure what you mean by optional? sunhme has been the default NIC 
for the
sun4u machine for several QEMU releases now.

> +#CONFIG_TEST_DEVICES=n
> +
> +# Boards:
> +#
>  CONFIG_SUN4U=y
>  CONFIG_NIAGARA=y
> diff --git a/hw/sparc64/Kconfig b/hw/sparc64/Kconfig
> index 41f7295..4a8166e 100644
> --- a/hw/sparc64/Kconfig
> +++ b/hw/sparc64/Kconfig
> @@ -1,6 +1,19 @@
>  config SUN4U
>      bool
> +    imply PCI_DEVICES
> +    imply SUNHME
> +    imply TEST_DEVICES
> +    select M48T59
>      select ISA_BUS
> +    select FDC
> +    select SERIAL_ISA
> +    select PCI_SABRE
> +    select IDE_CMD646
> +    select PARALLEL
> +    select PCKBD
> +    select SIMBA
>  
>  config NIAGARA
>      bool
> +    select EMPTY_SLOT
> +    select SUN4V_RTC
> 


ATB,

Mark.