From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:38024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmKij-0008Ce-4M for qemu-devel@nongnu.org; Wed, 23 Jan 2019 10:45:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmKih-0006Sc-1j for qemu-devel@nongnu.org; Wed, 23 Jan 2019 10:45:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59486) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmKif-0006RT-QE for qemu-devel@nongnu.org; Wed, 23 Jan 2019 10:45:38 -0500 References: <20190123065618.3520-1-yang.zhong@intel.com> <20190123065618.3520-9-yang.zhong@intel.com> From: Thomas Huth Message-ID: <7f3ade0c-781c-e18f-ec90-ee7ef8bb10d3@redhat.com> Date: Wed, 23 Jan 2019 16:45:30 +0100 MIME-Version: 1.0 In-Reply-To: <20190123065618.3520-9-yang.zhong@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [RFC PATCH v4 08/44] hw/ppc/Makefile.objs: Build all boards conditinally with CONFIG_* List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Yang Zhong , qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, ehabkost@redhat.com, =?UTF-8?B?w4Frb3MgS292w6Fjcw==?= , pbonzini@redhat.com, sameo@linux.intel.com On 2019-01-23 07:55, Yang Zhong wrote: > From: =C3=81kos Kov=C3=A1cs >=20 > CONFIG_PPC405, CONFIG_PPC440, CONFIG_MAC_OLDWORLD, CONFIG_MAX_NEWWORLD > and CONFIG_VIRTEX configuration options created for > default-configs/ppc*-softmmu.mak. >=20 > Signed-off-by: =C3=81kos Kov=C3=A1cs > Signed-off-by: Paolo Bonzini > Signed-off-by: Yang Zhong > --- > default-configs/ppc-softmmu.mak | 7 ++++++- > hw/ppc/Makefile.objs | 12 ++++++------ > 2 files changed, 12 insertions(+), 7 deletions(-) >=20 > diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-soft= mmu.mak > index 23d871fb3e..7f80f0ccba 100644 > --- a/default-configs/ppc-softmmu.mak > +++ b/default-configs/ppc-softmmu.mak > @@ -21,6 +21,10 @@ CONFIG_E500=3Dy > CONFIG_OPENPIC_KVM=3D$(call land,$(CONFIG_E500),$(CONFIG_KVM)) > CONFIG_PLATFORM_BUS=3Dy > CONFIG_ETSEC=3Dy > +CONFIG_PPC405=3Dy > +CONFIG_PPC440=3Dy > +CONFIG_VIRTEX=3Dy > + > # For Sam460ex > CONFIG_SAM460EX=3Dy > CONFIG_USB_EHCI_SYSBUS=3Dy > @@ -34,7 +38,6 @@ CONFIG_M41T80=3Dy > CONFIG_VGA_CIRRUS=3Dy > =20 > # For Macs > -CONFIG_MAC=3Dy > CONFIG_ESCC=3Dy > CONFIG_MACIO=3Dy > CONFIG_MACIO_GPIO=3Dy > @@ -50,6 +53,8 @@ CONFIG_GRACKLE_PCI=3Dy > CONFIG_UNIN_PCI=3Dy > CONFIG_DEC_PCI=3Dy > CONFIG_IDE_MACIO=3Dy > +CONFIG_MAC_OLDWORLD=3Dy > +CONFIG_MAC_NEWWORLD=3Dy > =20 > # For PReP > CONFIG_PREP=3Dy > 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 +=3D spapr_pci_vfio.o > endif > obj-$(CONFIG_PSERIES) +=3D spapr_rtas_ddw.o > # PowerPC 4xx boards > -obj-y +=3D 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=3Dqemu.git;a=3Dcommitdiff;h=3Df8567a11fb63d62644d= fdf ), 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 > -obj-$(CONFIG_PPC4XX) +=3D ppc4xx_pci.o ppc405_boards.o > -obj-$(CONFIG_PPC4XX) +=3D ppc440_bamboo.o ppc440_pcix.o ppc440_uc.o > +obj-$(CONFIG_PPC405) +=3D ppc405_boards.o ppc405_uc.o > +obj-$(CONFIG_PPC440) +=3D ppc440_bamboo.o ppc440_pcix.o ppc440_uc.o > +obj-$(CONFIG_PPC4XX) +=3D ppc4xx_pci.o ppc4xx_devs.o > obj-$(CONFIG_SAM460EX) +=3D sam460ex.o > # PReP > obj-$(CONFIG_PREP) +=3D prep.o > obj-$(CONFIG_PREP) +=3D prep_systemio.o > obj-${CONFIG_RS6000_MC} +=3D rs6000_mc.o > # OldWorld PowerMac > -obj-$(CONFIG_MAC) +=3D mac_oldworld.o > +obj-$(CONFIG_MAC_OLDWORLD) +=3D mac_oldworld.o > # NewWorld PowerMac > -obj-$(CONFIG_MAC) +=3D mac_newworld.o > +obj-$(CONFIG_MAC_NEWWORLD) +=3D mac_newworld.o > # e500 > obj-$(CONFIG_E500) +=3D e500.o mpc8544ds.o e500plat.o > obj-$(CONFIG_E500) +=3D mpc8544_guts.o ppce500_spin.o > # PowerPC 440 Xilinx ML507 reference board. > -obj-$(CONFIG_XILINX) +=3D virtex_ml507.o > +obj-$(CONFIG_VIRTEX) +=3D virtex_ml507.o