diff options
author | Peter Tyser <ptyser@xes-inc.com> | 2009-12-30 17:23:26 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2009-12-30 17:23:26 -0500 |
commit | 3f884bf54dde417e963a0e6effb8f2c01f95abee (patch) | |
tree | c633141b2d4fb9076888fe108d664f3a7248d72c /arch | |
parent | 06d352f2f1a750b99ba708cb390d95d007ef344c (diff) |
powerpc: Use scripts/mkuboot.sh instead of 'mkimage'
mkuboot.sh provides a basic wrapper for the 'mkimage' utility. Using
mkuboot.sh provides clearer error reporting and allows a toolchain to
use its own 'mkimage' executable specified by ${CROSS_COMPILE}mkimage.
Additionally, this brings PowerPC in line with other architectures
which already call mkimage via mkuboot.sh.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch')
-rwxr-xr-x | arch/powerpc/boot/wrapper | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index 390512ae7f86..f4594ed09a20 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper | |||
@@ -43,6 +43,9 @@ gzip=.gz | |||
43 | # cross-compilation prefix | 43 | # cross-compilation prefix |
44 | CROSS= | 44 | CROSS= |
45 | 45 | ||
46 | # mkimage wrapper script | ||
47 | MKIMAGE=$srctree/scripts/mkuboot.sh | ||
48 | |||
46 | # directory for object and other files used by this script | 49 | # directory for object and other files used by this script |
47 | object=arch/powerpc/boot | 50 | object=arch/powerpc/boot |
48 | objbin=$object | 51 | objbin=$object |
@@ -267,7 +270,7 @@ membase=`${CROSS}objdump -p "$kernel" | grep -m 1 LOAD | awk '{print $7}'` | |||
267 | case "$platform" in | 270 | case "$platform" in |
268 | uboot) | 271 | uboot) |
269 | rm -f "$ofile" | 272 | rm -f "$ofile" |
270 | mkimage -A ppc -O linux -T kernel -C gzip -a $membase -e $membase \ | 273 | ${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a $membase -e $membase \ |
271 | $uboot_version -d "$vmz" "$ofile" | 274 | $uboot_version -d "$vmz" "$ofile" |
272 | if [ -z "$cacheit" ]; then | 275 | if [ -z "$cacheit" ]; then |
273 | rm -f "$vmz" | 276 | rm -f "$vmz" |
@@ -327,7 +330,7 @@ coff) | |||
327 | ;; | 330 | ;; |
328 | cuboot*) | 331 | cuboot*) |
329 | gzip -f -9 "$ofile" | 332 | gzip -f -9 "$ofile" |
330 | mkimage -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \ | 333 | ${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \ |
331 | $uboot_version -d "$ofile".gz "$ofile" | 334 | $uboot_version -d "$ofile".gz "$ofile" |
332 | ;; | 335 | ;; |
333 | treeboot*) | 336 | treeboot*) |