]> err.no Git - linux-2.6/commitdiff
[POWERPC] bootwrapper: Only build cuImage if CONFIG_DEVICE_TREE is non-empty
authorScott Wood <scottwood@freescale.com>
Wed, 2 May 2007 18:00:00 +0000 (04:00 +1000)
committerPaul Mackerras <paulus@samba.org>
Mon, 7 May 2007 10:31:13 +0000 (20:31 +1000)
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>
arch/powerpc/boot/Makefile

index 326ee92a2fc3bed46137b88d1a05f0a9f1a00953..f2d850ca5056bbaece7661d61dcd1f7a5a5ca5a6 100644 (file)
@@ -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.