| Message ID | 20080909140028.GA15005@yoda.jdub.homelinux.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | 32dde0f975e430f00f03f80f7dbab585d8b45eab |
| Headers | show |
On Tue, Sep 09, 2008 at 10:00:28AM -0400, Josh Boyer wrote: >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. When this >was done, it broke booting on the Holly board as the zImage.holly wrapper did >not get the DTB embedded properly. > >This patch 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> Paul, this should go into 2.6.27. The Holly board doesn't boot without it. josh
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 717a3bc..65d1a84 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
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. When this was done, it broke booting on the Holly board as the zImage.holly wrapper did not get the DTB embedded properly. This patch 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>