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

Subsystems: linux for powerpc (32-bit and 64-bit), the rest

STALE7047d

2 messages, 2 authors, 2007-05-03 · open the first message on its own page

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

From: Scott Wood <hidden>
Date: 2007-05-02 18:00:14

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 <redacted>
---
 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
+endif
 
 # For 32-bit powermacs, build the COFF and miboot images
 # as well as the ELF images.
-- 
1.5.0.3

Re: [PATCH] bootwrapper: Only build cuImage if CONFIG_DEVICE_TREE is non-empty.

From: David Gibson <hidden>
Date: 2007-05-03 07:06:48

On Wed, May 02, 2007 at 01:00:00PM -0500, Scott Wood wrote:
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 <redacted>
Acked-by: David Gibson <redacted>

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help