LinuxPPC-Dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Milton Miller <miltonm@bga.com>
To: Paul Mackerras <paulus@samba.org>, Olaf Hering <olaf@aepfle.de>
Cc: ppcdev <linuxppc-dev@ozlabs.org>
Subject: [PATCH] fix zImage.coff generation for pmac
Date: Wed, 30 May 2007 10:29:01 -0500	[thread overview]
Message-ID: <7cd1bd62cf3304f0ab57cadac1d26f8e@bga.com> (raw)
In-Reply-To: <20070525081459.GA30239@aepfle.de>

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@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"

      reply	other threads:[~2007-05-30 15:29 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-05-25  8:14 arch/powerpc/boot/coff.o Olaf Hering
2007-05-30 15:29 ` Milton Miller [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7cd1bd62cf3304f0ab57cadac1d26f8e@bga.com \
    --to=miltonm@bga.com \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=olaf@aepfle.de \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox