From a58202ef6756b2dffc523183ceb809e1016fe119 Mon Sep 17 00:00:00 2001 From: Scott Wood Date: Thu, 3 May 2007 04:00:00 +1000 Subject: [PATCH] --- yaml --- r: 55021 b: refs/heads/master c: ac18c673e7fa71f62ce613edfe6634edb99f968b h: refs/heads/master i: 55019: 7bff5c464aa65122431a1986509bce1a208bbd25 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/boot/Makefile | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3e47e2699dcd..866b4190635c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44755d11a3c054adf7eb974a4720936563cf7dcf +refs/heads/master: ac18c673e7fa71f62ce613edfe6634edb99f968b diff --git a/trunk/arch/powerpc/boot/Makefile b/trunk/arch/powerpc/boot/Makefile index 326ee92a2fc3..f2d850ca5056 100644 --- a/trunk/arch/powerpc/boot/Makefile +++ b/trunk/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.