Commit 5c539ee3 authored by David Woodhouse's avatar David Woodhouse Committed by Paul Mackerras

[POWERPC] Allow for bootwrapper utilities being in different directory 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: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 701172d1
...@@ -45,6 +45,7 @@ CROSS= ...@@ -45,6 +45,7 @@ CROSS=
# directory for object and other files used by this script # directory for object and other files used by this script
object=arch/powerpc/boot object=arch/powerpc/boot
objbin=$object
# directory for working files # directory for working files
tmpdir=. tmpdir=.
...@@ -95,6 +96,7 @@ while [ "$#" -gt 0 ]; do ...@@ -95,6 +96,7 @@ while [ "$#" -gt 0 ]; do
shift shift
[ "$#" -gt 0 ] || usage [ "$#" -gt 0 ] || usage
object="$1" object="$1"
objbin="$1"
;; ;;
-W) -W)
shift shift
...@@ -249,11 +251,11 @@ fi ...@@ -249,11 +251,11 @@ fi
# post-processing needed for some platforms # post-processing needed for some platforms
case "$platform" in case "$platform" in
pseries|chrp) pseries|chrp)
$object/addnote "$ofile" $objbin/addnote "$ofile"
;; ;;
coff) coff)
${CROSS}objcopy -O aixcoff-rs6000 --set-start "$entry" "$ofile" ${CROSS}objcopy -O aixcoff-rs6000 --set-start "$entry" "$ofile"
$object/hack-coff "$ofile" $objbin/hack-coff "$ofile"
;; ;;
cuboot*) cuboot*)
gzip -f -9 "$ofile" gzip -f -9 "$ofile"
...@@ -262,7 +264,7 @@ cuboot*) ...@@ -262,7 +264,7 @@ cuboot*)
;; ;;
treeboot*) treeboot*)
mv "$ofile" "$ofile.elf" mv "$ofile" "$ofile.elf"
$object/mktree "$ofile.elf" "$ofile" "$base" "$entry" $objbin/mktree "$ofile.elf" "$ofile" "$base" "$entry"
if [ -z "$cacheit" ]; then if [ -z "$cacheit" ]; then
rm -f "$ofile.elf" rm -f "$ofile.elf"
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment