On Mon, Sep 15, 2008 at 08:53:53PM +0200, Peter Korsgaard wrote: > From: peter Korsgaard <[EMAIL PROTECTED]> > > Support uImage.<platform>, which are U-Boot multi component images > containing a kernel, dtb and possibly an initrd. > > Signed-off-by: Peter Korsgaard <[EMAIL PROTECTED]> > --- > Documentation/powerpc/bootwrapper.txt | 4 ++++ > arch/powerpc/boot/Makefile | 11 +++++++++-- > arch/powerpc/boot/wrapper | 20 +++++++++++++++++++- > 3 files changed, 32 insertions(+), 3 deletions(-) > > diff --git a/Documentation/powerpc/bootwrapper.txt > b/Documentation/powerpc/bootwrapper.txt > index d60fced..f0b34b3 100644 > --- a/Documentation/powerpc/bootwrapper.txt > +++ b/Documentation/powerpc/bootwrapper.txt > @@ -91,6 +91,10 @@ Currently, the following image format targets exist: > a device tree to the kernel at boot. If using an older > version of U-Boot, then you need to use a cuImage > instead. > + uImage.thinx: U-Boot multi component image. Similar to uImage,
Change this to "uImage.%:" to match the rest of this document. > diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile > index 717a3bc..41ab6aa 100644 > --- a/arch/powerpc/boot/Makefile > +++ b/arch/powerpc/boot/Makefile > @@ -352,7 +359,7 @@ install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) > clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \ > zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \ > zImage.iseries zImage.miboot zImage.pmac zImage.pseries \ > - otheros.bld *.dtb > + otheros.bld uImage.* *.dtb Actually, you can probably make this "uImage*" instead because plain 'uImage' targets are missing from this list. > > # clean up files cached by wrapper > clean-kernel := vmlinux.strip vmlinux.bin > diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper > index 965c237..b7c0b23 100755 > --- a/arch/powerpc/boot/wrapper > +++ b/arch/powerpc/boot/wrapper > @@ -153,7 +153,7 @@ coff) > lds=$object/zImage.coff.lds > link_address='0x500000' > ;; > -miboot|uboot) > +miboot|uboot|uboot-*) Similarly, uboot and uboot-* can probably be collapsed to 'uboot*' g. _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
