Skip to content

Commit

Permalink
[POWERPC] Allow for bootwrapper utilities being in different director…
Browse files Browse the repository at this point in the history
…y to objects

It's possible that the executables which are built as helpers for the
bootwrapper stuff might end up in a different place to the intermediate
object files. Handle that.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
David Woodhouse authored and Paul Mackerras committed Dec 6, 2007
1 parent 701172d commit 5c539ee
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions arch/powerpc/boot/wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ CROSS=

# directory for object and other files used by this script
object=arch/powerpc/boot
objbin=$object

# directory for working files
tmpdir=.
Expand Down Expand Up @@ -95,6 +96,7 @@ while [ "$#" -gt 0 ]; do
shift
[ "$#" -gt 0 ] || usage
object="$1"
objbin="$1"
;;
-W)
shift
Expand Down Expand Up @@ -249,11 +251,11 @@ fi
# post-processing needed for some platforms
case "$platform" in
pseries|chrp)
$object/addnote "$ofile"
$objbin/addnote "$ofile"
;;
coff)
${CROSS}objcopy -O aixcoff-rs6000 --set-start "$entry" "$ofile"
$object/hack-coff "$ofile"
$objbin/hack-coff "$ofile"
;;
cuboot*)
gzip -f -9 "$ofile"
Expand All @@ -262,7 +264,7 @@ cuboot*)
;;
treeboot*)
mv "$ofile" "$ofile.elf"
$object/mktree "$ofile.elf" "$ofile" "$base" "$entry"
$objbin/mktree "$ofile.elf" "$ofile" "$base" "$entry"
if [ -z "$cacheit" ]; then
rm -f "$ofile.elf"
fi
Expand Down

0 comments on commit 5c539ee

Please sign in to comment.