Commit:     ac18c673e7fa71f62ce613edfe6634edb99f968b
Parent:     44755d11a3c054adf7eb974a4720936563cf7dcf
Author:     Scott Wood <[EMAIL PROTECTED]>
AuthorDate: Thu May 3 04:00:00 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Mon May 7 20:31:13 2007 +1000

    [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 <[EMAIL PROTECTED]>
    Acked-by: David Gibson <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
 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
 # For 32-bit powermacs, build the COFF and miboot images
 # as well as the ELF images.
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to