From: Scott Wood <scottwood@freescale.com>
Date: Wed, 2 May 2007 18:00:00 +0000 (+1000)
Subject: [POWERPC] bootwrapper: Only build cuImage if CONFIG_DEVICE_TREE is non-empty
X-Git-Tag: v2.6.22-rc1~358^2~41
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac18c673e7fa71f62ce613edfe6634edb99f968b;p=linux-2.6

[POWERPC] bootwrapper: Only build cuImage if CONFIG_DEVICE_TREE is non-empty

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 <scottwood@freescale.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 326ee92a2f..f2d850ca50 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.