On Thu, Dec 24, 2020 at 06:22:55PM +0100, Greg Kurz wrote:
> Have PSERIES to select XICS and XIVE, and directly check PSERIES
> in hw/intc/meson.build to enable build of the XICS and XIVE sPAPR
> backends, like POWERNV already does. This allows to get rid of the
> intermediate XICS_SPAPR and XIVE_SPAPR.
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>

Applied, thanks.

> ---
>  hw/intc/Kconfig     |    4 +---
>  hw/intc/meson.build |    3 +--
>  hw/ppc/Kconfig      |   14 ++------------
>  3 files changed, 4 insertions(+), 17 deletions(-)
> 
> diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig
> index fa2695e58d56..c18d11142a8f 100644
> --- a/hw/intc/Kconfig
> +++ b/hw/intc/Kconfig
> @@ -32,11 +32,9 @@ config ARM_GIC_KVM
>  
>  config XICS
>      bool
> -    depends on POWERNV || PSERIES
>  
> -config XICS_SPAPR
> +config XIVE
>      bool
> -    select XICS
>  
>  config ALLWINNER_A10_PIC
>      bool
> diff --git a/hw/intc/meson.build b/hw/intc/meson.build
> index b6c9218908e3..53cba115690f 100644
> --- a/hw/intc/meson.build
> +++ b/hw/intc/meson.build
> @@ -53,8 +53,7 @@ specific_ss.add(when: 'CONFIG_SIFIVE_PLIC', if_true: files('sifive_plic.c'))
>  specific_ss.add(when: 'CONFIG_XICS', if_true: files('xics.c'))
>  specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_XICS'],
>  		if_true: files('xics_kvm.c'))
> -specific_ss.add(when: 'CONFIG_XICS_SPAPR', if_true: files('xics_spapr.c'))
> +specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('xics_spapr.c', 'spapr_xive.c'))
>  specific_ss.add(when: 'CONFIG_XIVE', if_true: files('xive.c'))
>  specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_XIVE'],
>  		if_true: files('spapr_xive_kvm.c'))
> -specific_ss.add(when: 'CONFIG_XIVE_SPAPR', if_true: files('spapr_xive.c'))
> diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
> index e35710c7c368..a213994ebf5d 100644
> --- a/hw/ppc/Kconfig
> +++ b/hw/ppc/Kconfig
> @@ -7,8 +7,8 @@ config PSERIES
>      select PCI
>      select SPAPR_VSCSI
>      select VFIO if LINUX   # needed by spapr_pci_vfio.c
> -    select XICS_SPAPR
> -    select XIVE_SPAPR
> +    select XICS
> +    select XIVE
>      select MSI_NONBROKEN
>      select FDT_PPC
>      select CHRP_NVRAM
> @@ -129,16 +129,6 @@ config VIRTEX
>      select XILINX_ETHLITE
>      select FDT_PPC
>  
> -config XIVE
> -    bool
> -    depends on POWERNV || PSERIES
> -
> -config XIVE_SPAPR
> -    bool
> -    default y
> -    depends on PSERIES
> -    select XIVE
> -
>  # Only used by 64-bit targets
>  config FW_CFG_PPC
>      bool
> 
> 

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson