Re: [Qemu-devel] [RFC PATCH v4 08/44] hw/ppc/Makefile.objs: Build all boards conditinally with CONFIG_*

[Thomas Huth <thuth@redhat.com>]

On 2019-01-23 07:55, Yang Zhong wrote:
> From: Ákos Kovács <akoskovacs@gmx.com>
> 
> CONFIG_PPC405, CONFIG_PPC440, CONFIG_MAC_OLDWORLD, CONFIG_MAX_NEWWORLD
> and CONFIG_VIRTEX configuration options created for
> default-configs/ppc*-softmmu.mak.
> 
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Yang Zhong <yang.zhong@intel.com>
> ---
>  default-configs/ppc-softmmu.mak |  7 ++++++-
>  hw/ppc/Makefile.objs            | 12 ++++++------
>  2 files changed, 12 insertions(+), 7 deletions(-)
> 
> diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
> index 23d871fb3e..7f80f0ccba 100644
> --- a/default-configs/ppc-softmmu.mak
> +++ b/default-configs/ppc-softmmu.mak
> @@ -21,6 +21,10 @@ CONFIG_E500=y
>  CONFIG_OPENPIC_KVM=$(call land,$(CONFIG_E500),$(CONFIG_KVM))
>  CONFIG_PLATFORM_BUS=y
>  CONFIG_ETSEC=y
> +CONFIG_PPC405=y
> +CONFIG_PPC440=y
> +CONFIG_VIRTEX=y
> +
>  # For Sam460ex
>  CONFIG_SAM460EX=y
>  CONFIG_USB_EHCI_SYSBUS=y
> @@ -34,7 +38,6 @@ CONFIG_M41T80=y
>  CONFIG_VGA_CIRRUS=y
>  
>  # For Macs
> -CONFIG_MAC=y
>  CONFIG_ESCC=y
>  CONFIG_MACIO=y
>  CONFIG_MACIO_GPIO=y
> @@ -50,6 +53,8 @@ CONFIG_GRACKLE_PCI=y
>  CONFIG_UNIN_PCI=y
>  CONFIG_DEC_PCI=y
>  CONFIG_IDE_MACIO=y
> +CONFIG_MAC_OLDWORLD=y
> +CONFIG_MAC_NEWWORLD=y
>  
>  # For PReP
>  CONFIG_PREP=y
> diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
> index 4e0c1c0941..2ce7973219 100644
> --- a/hw/ppc/Makefile.objs
> +++ b/hw/ppc/Makefile.objs
> @@ -13,20 +13,20 @@ obj-y += spapr_pci_vfio.o
>  endif
>  obj-$(CONFIG_PSERIES) += spapr_rtas_ddw.o
>  # PowerPC 4xx boards
> -obj-y += ppc4xx_devs.o ppc405_uc.o

Could you please leave these two files above always enabled for now? I
tried to make them configurable in the past already (see
https://git.qemu.org/?p=qemu.git;a=commitdiff;h=f8567a11fb63d62644dfdf
), but there are some dependencies from the generic code to functions in
this file which have to be solved first...

With that fixed:

Reviewed-by: Thomas Huth <thuth@redhat.com>


> -obj-$(CONFIG_PPC4XX) += ppc4xx_pci.o ppc405_boards.o
> -obj-$(CONFIG_PPC4XX) += ppc440_bamboo.o ppc440_pcix.o ppc440_uc.o
> +obj-$(CONFIG_PPC405) += ppc405_boards.o  ppc405_uc.o
> +obj-$(CONFIG_PPC440) += ppc440_bamboo.o ppc440_pcix.o ppc440_uc.o
> +obj-$(CONFIG_PPC4XX) += ppc4xx_pci.o ppc4xx_devs.o
>  obj-$(CONFIG_SAM460EX) += sam460ex.o
>  # PReP
>  obj-$(CONFIG_PREP) += prep.o
>  obj-$(CONFIG_PREP) += prep_systemio.o
>  obj-${CONFIG_RS6000_MC} += rs6000_mc.o
>  # OldWorld PowerMac
> -obj-$(CONFIG_MAC) += mac_oldworld.o
> +obj-$(CONFIG_MAC_OLDWORLD) += mac_oldworld.o
>  # NewWorld PowerMac
> -obj-$(CONFIG_MAC) += mac_newworld.o
> +obj-$(CONFIG_MAC_NEWWORLD) += mac_newworld.o
>  # e500
>  obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o
>  obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o
>  # PowerPC 440 Xilinx ML507 reference board.
> -obj-$(CONFIG_XILINX) += virtex_ml507.o
> +obj-$(CONFIG_VIRTEX) += virtex_ml507.o