瀏覽代碼

[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>
Scott Wood 18 年之前
父節點
當前提交
ac18c673e7
共有 1 個文件被更改,包括 4 次插入1 次删除
  1. 4 1
      arch/powerpc/boot/Makefile

+ 4 - 1
arch/powerpc/boot/Makefile

@@ -129,9 +129,12 @@ image-$(CONFIG_PPC_CELLEB)		+= zImage.pseries
 image-$(CONFIG_PPC_CHRP)		+= zImage.chrp
 image-$(CONFIG_PPC_CHRP)		+= zImage.chrp
 image-$(CONFIG_PPC_EFIKA)		+= zImage.chrp
 image-$(CONFIG_PPC_EFIKA)		+= zImage.chrp
 image-$(CONFIG_PPC_PMAC)		+= zImage.pmac
 image-$(CONFIG_PPC_PMAC)		+= zImage.pmac
+image-$(CONFIG_DEFAULT_UIMAGE)		+= uImage
+
+ifneq ($(CONFIG_DEVICE_TREE),"")
 image-$(CONFIG_PPC_83xx)		+= cuImage.83xx
 image-$(CONFIG_PPC_83xx)		+= cuImage.83xx
 image-$(CONFIG_PPC_85xx)		+= cuImage.85xx
 image-$(CONFIG_PPC_85xx)		+= cuImage.85xx
-image-$(CONFIG_DEFAULT_UIMAGE)		+= uImage
+endif
 
 
 # For 32-bit powermacs, build the COFF and miboot images
 # For 32-bit powermacs, build the COFF and miboot images
 # as well as the ELF images.
 # as well as the ELF images.