From: Scott Wood 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: MMI-PSA29.97-13-9~43501^2~41 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ac18c673e7fa71f62ce613edfe6634edb99f968b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [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 Acked-by: David Gibson Signed-off-by: Paul Mackerras --- diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 326ee92a2fc3..f2d850ca5056 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.