diff options
author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-09-09 04:00:28 +0000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-09-17 09:14:42 -0700 |
commit | 32dde0f975e430f00f03f80f7dbab585d8b45eab (patch) | |
tree | 16df727d3119c93d7668e3468b90bf58eb294f23 | |
parent | 612f9d338a6060f814ef35b7108b43407a5df423 (diff) | |
download | linux-stable-32dde0f975e430f00f03f80f7dbab585d8b45eab.tar.gz linux-stable-32dde0f975e430f00f03f80f7dbab585d8b45eab.tar.bz2 linux-stable-32dde0f975e430f00f03f80f7dbab585d8b45eab.zip |
powerpc: Holly board needs dtbImage target
One of the changes in the bootwrapper makefile introduced the dtbImage
targets for boards that need a simple zImage with a DTB embedded in
them (595be948cce574ff2d5dde5d0426a636a4363c70, "[POWERPC]
bootwrapper: Build multiple cuImages"). When this was done, it broke
booting on the Holly board as the zImage.holly wrapper did not get the
DTB embedded properly.
This changes the target for the Holly board to a dtbImage so that the
wrapper includes the vmlinux, wrapper bits, and DTB.
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/boot/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 717a3bc1352e..65d1a8454d2c 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile @@ -195,7 +195,7 @@ 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_PPC_HOLLY) += zImage.holly +image-$(CONFIG_PPC_HOLLY) += dtbImage.holly image-$(CONFIG_PPC_PRPMC2800) += dtbImage.prpmc2800 image-$(CONFIG_PPC_ISERIES) += zImage.iseries image-$(CONFIG_DEFAULT_UIMAGE) += uImage |