diff options
| author | Scott Wood <scottwood@freescale.com> | 2007-05-02 20:00:00 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 12:31:13 +0200 |
| commit | ac18c673e7fa71f62ce613edfe6634edb99f968b (patch) | |
| tree | 6040fe891c91dc90fbb56855dd7887466f465f9f | |
| parent | [POWERPC] Add smp_call_function_map and smp_call_function_single (diff) | |
| download | linux-ac18c673e7fa71f62ce613edfe6634edb99f968b.tar.xz linux-ac18c673e7fa71f62ce613edfe6634edb99f968b.zip | |
[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>
| -rw-r--r-- | 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 326ee92a2fc3..f2d850ca5056 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. |