diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-12-03 03:52:05 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-06 04:44:30 +0100 |
| commit | 5c539ee38263c12121d777c2e7119807742e9368 (patch) | |
| tree | 3214c1f7e7631f53515e8e2973dcd2e1f0f8ce7a | |
| parent | [POWERPC] Find device-tree source file in default directory (diff) | |
| download | linux-5c539ee38263c12121d777c2e7119807742e9368.tar.xz linux-5c539ee38263c12121d777c2e7119807742e9368.zip | |
[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: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rwxr-xr-x | arch/powerpc/boot/wrapper | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index b8e4856af759..a591ced47875 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper @@ -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=. @@ -95,6 +96,7 @@ while [ "$#" -gt 0 ]; do shift [ "$#" -gt 0 ] || usage object="$1" + objbin="$1" ;; -W) shift @@ -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" @@ -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 |