From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from de01egw02.freescale.net (de01egw02.freescale.net [192.88.165.103]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "de01egw02.freescale.net", Issuer "Thawte Premium Server CA" (verified OK)) by ozlabs.org (Postfix) with ESMTP id F2759DDE33 for ; Thu, 3 May 2007 04:00:14 +1000 (EST) Date: Wed, 2 May 2007 13:00:00 -0500 From: Scott Wood To: paulus@samba.org Subject: [PATCH] bootwrapper: Only build cuImage if CONFIG_DEVICE_TREE is non-empty. Message-ID: <20070502180000.GA15154@ld0162-tx32.am.freescale.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linuxppc-dev@ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , This allows the zImage target to once again be used to build all supported image types, rather than requiring an explicit "make uImage" to avoid failing to create an unneeded cuImage. Signed-off-by: Scott Wood --- arch/powerpc/boot/Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 326ee92..f2d850c 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -129,9 +129,12 @@ image-$(CONFIG_PPC_CELLEB) += zImage.pseries image-$(CONFIG_PPC_CHRP) += zImage.chrp image-$(CONFIG_PPC_EFIKA) += zImage.chrp image-$(CONFIG_PPC_PMAC) += zImage.pmac +image-$(CONFIG_DEFAULT_UIMAGE) += uImage + +ifneq ($(CONFIG_DEVICE_TREE),"") image-$(CONFIG_PPC_83xx) += cuImage.83xx image-$(CONFIG_PPC_85xx) += cuImage.85xx -image-$(CONFIG_DEFAULT_UIMAGE) += uImage +endif # For 32-bit powermacs, build the COFF and miboot images # as well as the ELF images. -- 1.5.0.3