aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2007-05-02 14:00:00 -0400
committerPaul Mackerras <paulus@samba.org>2007-05-07 06:31:13 -0400
commitac18c673e7fa71f62ce613edfe6634edb99f968b (patch)
tree6040fe891c91dc90fbb56855dd7887466f465f9f /arch
parent44755d11a3c054adf7eb974a4720936563cf7dcf (diff)
[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 <scottwood@freescale.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/boot/Makefile5
1 files changed, 4 insertions, 1 deletions
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
129image-$(CONFIG_PPC_CHRP) += zImage.chrp 129image-$(CONFIG_PPC_CHRP) += zImage.chrp
130image-$(CONFIG_PPC_EFIKA) += zImage.chrp 130image-$(CONFIG_PPC_EFIKA) += zImage.chrp
131image-$(CONFIG_PPC_PMAC) += zImage.pmac 131image-$(CONFIG_PPC_PMAC) += zImage.pmac
132image-$(CONFIG_DEFAULT_UIMAGE) += uImage
133
134ifneq ($(CONFIG_DEVICE_TREE),"")
132image-$(CONFIG_PPC_83xx) += cuImage.83xx 135image-$(CONFIG_PPC_83xx) += cuImage.83xx
133image-$(CONFIG_PPC_85xx) += cuImage.85xx 136image-$(CONFIG_PPC_85xx) += cuImage.85xx
134image-$(CONFIG_DEFAULT_UIMAGE) += uImage 137endif
135 138
136# For 32-bit powermacs, build the COFF and miboot images 139# For 32-bit powermacs, build the COFF and miboot images
137# as well as the ELF images. 140# as well as the ELF images.