* zImage.chrp broken in 2.6.5, patch provided, please someone apply it.
@ 2004-04-16 8:56 Sven Luther
2004-04-16 13:22 ` Sven Luther
0 siblings, 1 reply; 3+ messages in thread
From: Sven Luther @ 2004-04-16 8:56 UTC (permalink / raw)
To: linuxppc-dev
[-- Attachment #1: Type: text/plain, Size: 345 bytes --]
Hello,
Find here attached a patch to enable zImage.chrp to work again (and
probably zImage.chrp-rs6k too). This was broken in 2.6.5, when akpm
introduced the ld.script dependency, without fixing the cmd_gen-chrp
to not take $^ to link, but the individual objects, as done for the
pmac case.
I hope i did the right fix.
Friendly,
Sven Luther
[-- Attachment #2: Makefile.diff --]
[-- Type: text/plain, Size: 720 bytes --]
--- arch/ppc/boot/openfirmware/Makefile.orig 2004-04-16 10:49:09.675252096 +0200
+++ arch/ppc/boot/openfirmware/Makefile 2004-04-16 10:52:02.941911560 +0200
@@ -123,10 +123,10 @@
$(call cmd,gen-elf-pmac)
quiet_cmd_gen-chrp = CHRP $@
- cmd_gen-chrp = $(LD) $(CHRP_LD_ARGS) -o $@ $^ && \
+ cmd_gen-chrp = $(LD) $(CHRP_LD_ARGS) -o $@ $(CHRPOBJS) $(LIBS) $< && \
$(OBJCOPY) $@ $@ -R .comment $(del-ramdisk-sec)
-$(images)/zImage.chrp: $(CHRPOBJS) $(obj)/image.o $(LIBS) $(boot)/ld.script
+$(images)/zImage.chrp: $(obj)/image.o $(CHRPOBJS) $(LIBS) $(boot)/ld.script
$(call cmd,gen-chrp)
$(images)/zImage.initrd.chrp: $(CHRPOBJS) $(obj)/image.initrd.o $(LIBS) $(boot)/ld.script
$(call cmd,gen-chrp)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: zImage.chrp broken in 2.6.5, patch provided, please someone apply it.
2004-04-16 8:56 zImage.chrp broken in 2.6.5, patch provided, please someone apply it Sven Luther
@ 2004-04-16 13:22 ` Sven Luther
2004-04-26 22:17 ` Tom Rini
0 siblings, 1 reply; 3+ messages in thread
From: Sven Luther @ 2004-04-16 13:22 UTC (permalink / raw)
To: Sven Luther; +Cc: linuxppc-dev
On Fri, Apr 16, 2004 at 10:56:41AM +0200, Sven Luther wrote:
> Hello,
>
> Find here attached a patch to enable zImage.chrp to work again (and
> probably zImage.chrp-rs6k too). This was broken in 2.6.5, when akpm
> introduced the ld.script dependency, without fixing the cmd_gen-chrp
> to not take $^ to link, but the individual objects, as done for the
> pmac case.
>
> I hope i did the right fix.
>
> Friendly,
>
> Sven Luther
Ah, the patch didn't work after all, while this one does :
diff -urN kernel-source-2.6.5/arch/ppc/boot/openfirmware/Makefile kernel-source-2.6.5-powerpc/arch/ppc/boot/openfirmware/Makefile
--- kernen-source-2.6.5/arch/ppc/boot/openfirmware/Makefile.orig 2004-04-16 10:49:09.675252096 +0200
+++ kernel-source-2.6.5-powerpc/arch/ppc/boot/openfirmware/Makefile 2004-04-16 10:52:02.941911560 +0200
@@ -123,10 +123,10 @@
$(call cmd,gen-elf-pmac)
quiet_cmd_gen-chrp = CHRP $@
- cmd_gen-chrp = $(LD) $(CHRP_LD_ARGS) -o $@ $^ && \
+ cmd_gen-chrp = $(LD) $(CHRP_LD_ARGS) -o $@ $(CHRPOBJS) $< $(LIBS) && \
$(OBJCOPY) $@ $@ -R .comment $(del-ramdisk-sec)
-$(images)/zImage.chrp: $(CHRPOBJS) $(obj)/image.o $(LIBS) $(boot)/ld.script
+$(images)/zImage.chrp: $(obj)/image.o $(CHRPOBJS) $(LIBS) $(boot)/ld.script
$(call cmd,gen-chrp)
$(images)/zImage.initrd.chrp: $(CHRPOBJS) $(obj)/image.initrd.o $(LIBS) $(boot)/ld.script
$(call cmd,gen-chrp)
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: zImage.chrp broken in 2.6.5, patch provided, please someone apply it.
2004-04-16 13:22 ` Sven Luther
@ 2004-04-26 22:17 ` Tom Rini
0 siblings, 0 replies; 3+ messages in thread
From: Tom Rini @ 2004-04-26 22:17 UTC (permalink / raw)
To: Sven Luther; +Cc: linuxppc-dev
On Fri, Apr 16, 2004 at 03:22:43PM +0200, Sven Luther wrote:
>
> On Fri, Apr 16, 2004 at 10:56:41AM +0200, Sven Luther wrote:
> > Hello,
> >
> > Find here attached a patch to enable zImage.chrp to work again (and
> > probably zImage.chrp-rs6k too). This was broken in 2.6.5, when akpm
> > introduced the ld.script dependency, without fixing the cmd_gen-chrp
> > to not take $^ to link, but the individual objects, as done for the
> > pmac case.
> >
> > I hope i did the right fix.
> >
> > Friendly,
> >
> > Sven Luther
>
> Ah, the patch didn't work after all, while this one does :
>
> diff -urN kernel-source-2.6.5/arch/ppc/boot/openfirmware/Makefile kernel-source-2.6.5-powerpc/arch/ppc/boot/openfirmware/Makefile
> --- kernen-source-2.6.5/arch/ppc/boot/openfirmware/Makefile.orig 2004-04-16 10:49:09.675252096 +0200
> +++ kernel-source-2.6.5-powerpc/arch/ppc/boot/openfirmware/Makefile 2004-04-16 10:52:02.941911560 +0200
> @@ -123,10 +123,10 @@
> $(call cmd,gen-elf-pmac)
>
> quiet_cmd_gen-chrp = CHRP $@
> - cmd_gen-chrp = $(LD) $(CHRP_LD_ARGS) -o $@ $^ && \
> + cmd_gen-chrp = $(LD) $(CHRP_LD_ARGS) -o $@ $(CHRPOBJS) $< $(LIBS) && \
> $(OBJCOPY) $@ $@ -R .comment $(del-ramdisk-sec)
>
> -$(images)/zImage.chrp: $(CHRPOBJS) $(obj)/image.o $(LIBS) $(boot)/ld.script
> +$(images)/zImage.chrp: $(obj)/image.o $(CHRPOBJS) $(LIBS) $(boot)/ld.script
> $(call cmd,gen-chrp)
> $(images)/zImage.initrd.chrp: $(CHRPOBJS) $(obj)/image.initrd.o $(LIBS) $(boot)/ld.script
> $(call cmd,gen-chrp)
I believe that this breaks zImage.initrd.chrp, since it's only part of
'$^'.
--
Tom Rini
http://gate.crashing.org/~trini/
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2004-04-26 22:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-04-16 8:56 zImage.chrp broken in 2.6.5, patch provided, please someone apply it Sven Luther
2004-04-16 13:22 ` Sven Luther
2004-04-26 22:17 ` Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).