[PATCH] fix zImage.coff generation for pmac
Milton Miller
miltonm at bga.com
Thu May 31 01:29:01 EST 2007
Commit 9da82a6dee9db4cd5ae7a74ab4f51afb52b6efb9 inadvertently
removed the platform override for zImage.coff to be generated
with pmaccoff. Rather than add a special makefile rule,
change the platform for which the wrapper platform uses
the special rules.
Signed-off-by: Milton Miller <miltonm at bga.com>
---
Untested, and hopefully not too whitespace damaged.
Against upstream after 2.6.22-rc3.
We could look for both coff and pmaccoff if someone
has an external script calling wrapper with platform
pmaccoff (change to coff|pmaccoff).
Olof Hering wrote:
> Does anyone happen to know where the arch/powerpc/boot/coff.o is
> supposed to come from? Current Linus tree fails since a while with the
> following commands.
>
> tar xfz /mounts/mirror/kernel/v2.6/testing/linux-2.6.22-rc2.tar.gz
> cd linux-2.6.22-rc2/
> mkdir ../O
> cp arch/powerpc/configs/pmac32_defconfig ../O/.config
> make -kj42 O=../O menuconfig
> make -kj42 O=../O
>
> WRAP arch/powerpc/boot/zImage.coff
> ld: arch/powerpc/boot/coff.o: No such file: No such file or directory
> nm: 'arch/powerpc/boot/zImage.coff': No such file
> objdump: 'arch/powerpc/boot/zImage.coff': No such file
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index 5cedd90..b28161c 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -129,7 +129,7 @@ case "$platform" in
pmac|pseries|chrp)
platformo=$object/of.o
;;
-pmaccoff)
+coff)
platformo=$object/of.o
lds=$object/zImage.coff.lds
;;
@@ -217,7 +217,7 @@ case "$platform" in
pseries|chrp)
$object/addnote "$ofile"
;;
-pmaccoff)
+coff)
entry=`objdump -f "$ofile" | grep '^start address ' | \
cut -d' ' -f3`
${CROSS}objcopy -O aixcoff-rs6000 --set-start "$entry" "$ofile"
More information about the Linuxppc-dev
mailing list