zImage.chrp broken in 2.6.5, patch provided, please someone apply it.
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
ppc/boot/openfirmware/Makefile renamed from ppc/boot/openfirmware/Makefile.orig +2 -2
@@ -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)
Quoted 8 lines · Sven Luther
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.
Quoted 5 lines
I hope i did the right fix.
Friendly,
Sven Luther
Ah, the patch didn't work after all, while this one does :
arch/ppc/boot/openfirmware/Makefile renamed from arch/ppc/boot/openfirmware/Makefile.orig +2 -2
@@ -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/
Quoted 24 lines · Sven Luther
Quoted 8 lines · Sven Luther
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.
Quoted 5 lines
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
arch/ppc/boot/openfirmware/Makefile renamed from arch/ppc/boot/openfirmware/Makefile.orig +0
-0@@ -123,10 +123,10 @@ $(call cmd,gen-elf-pmac)
arch/ppc/boot/openfirmware/Makefile line 132
Quoted 10 lines
arch/ppc/boot/openfirmware/Makefile renamed from arch/ppc/boot/openfirmware/Makefile.orig +2
-2quiet_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/