From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCvVR-0007oK-SR for qemu-devel@nongnu.org; Tue, 05 Mar 2013 12:18:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UCvVQ-0004L7-Ph for qemu-devel@nongnu.org; Tue, 05 Mar 2013 12:18:25 -0500 Received: from mail-qa0-f44.google.com ([209.85.216.44]:35474) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCvVQ-0004L2-M0 for qemu-devel@nongnu.org; Tue, 05 Mar 2013 12:18:24 -0500 Received: by mail-qa0-f44.google.com with SMTP id bv4so2033745qab.17 for ; Tue, 05 Mar 2013 09:18:24 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 5 Mar 2013 18:17:38 +0100 Message-Id: <1362503865-27292-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1362503865-27292-1-git-send-email-pbonzini@redhat.com> References: <1362503865-27292-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 11/18] ppc: express FDT dependency of pSeries and e500 boards via default-configs/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- configure | 3 --- default-configs/ppc-softmmu.mak | 1 + default-configs/ppc64-softmmu.mak | 2 ++ default-configs/ppcemb-softmmu.mak | 1 + hw/ppc/Makefile.objs | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 8fdc2cf..ae3d9c5 100755 --- a/configure +++ b/configure @@ -4144,9 +4144,6 @@ case "$target_arch2" in i386|x86_64) echo "CONFIG_HAVE_GET_MEMORY_MAPPING=y" >> $config_target_mak esac -if test "$target_arch2" = "ppc64" -a "$fdt" = "yes"; then - echo "CONFIG_PSERIES=y" >> $config_target_mak -fi if test "$target_bigendian" = "yes" ; then echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak fi diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index f9f8a81..c209a8d 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -40,3 +40,4 @@ CONFIG_PFLASH_CFI02=y CONFIG_PTIMER=y CONFIG_I8259=y CONFIG_XILINX=y +CONFIG_E500=$(CONFIG_FDT) diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index dc44294..8d490bd 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -40,3 +40,5 @@ CONFIG_PFLASH_CFI02=y CONFIG_PTIMER=y CONFIG_I8259=y CONFIG_XILINX=y +CONFIG_PSERIES=$(CONFIG_FDT) +CONFIG_E500=$(CONFIG_FDT) diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak index 1c6bcf9..7f13421 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -35,3 +35,4 @@ CONFIG_PFLASH_CFI02=y CONFIG_PTIMER=y CONFIG_I8259=y CONFIG_XILINX=y +CONFIG_E500=$(CONFIG_FDT) diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index bbbe78e..9141373 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -11,7 +11,7 @@ obj-$(CONFIG_PSERIES) += spapr_events.o spapr_nvram.o obj-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o obj-y += ppc440_bamboo.o # PowerPC E500 boards -obj-$(CONFIG_FDT) += mpc8544_guts.o ppce500_spin.o +obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o # PowerPC 440 Xilinx ML507 reference board. obj-y += virtex_ml507.o # PowerPC OpenPIC @@ -29,4 +29,4 @@ obj-y += mac_oldworld.o # NewWorld PowerMac obj-y += mac_newworld.o # e500 -obj-$(CONFIG_FDT) += e500.o mpc8544ds.o e500plat.o +obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o -- 1.8.1.2