Patchwork [v2,1/3] powerpc: Use scripts/mkuboot.sh instead of 'mkimage'

login
register
mail settings
Submitter Peter Tyser
Date Dec. 22, 2009, 1:50 a.m.
Message ID <1261446643-21714-2-git-send-email-ptyser@xes-inc.com>
Download mbox | patch
Permalink /patch/41573/
State Accepted
Delegated to: Grant Likely
Headers show

Comments

Peter Tyser - Dec. 22, 2009, 1:50 a.m.
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>
---
 arch/powerpc/boot/wrapper |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
Grant Likely - Dec. 30, 2009, 10:25 p.m.
On Mon, Dec 21, 2009 at 6:50 PM, Peter Tyser <ptyser@xes-inc.com> wrote:
> 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>

Okay by me.  I've picked this one up.

g.

> ---
>  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 390512a..f4594ed 100755
> --- a/arch/powerpc/boot/wrapper
> +++ b/arch/powerpc/boot/wrapper
> @@ -43,6 +43,9 @@ gzip=.gz
>  # cross-compilation prefix
>  CROSS=
>
> +# mkimage wrapper script
> +MKIMAGE=$srctree/scripts/mkuboot.sh
> +
>  # directory for object and other files used by this script
>  object=arch/powerpc/boot
>  objbin=$object
> @@ -267,7 +270,7 @@ membase=`${CROSS}objdump -p "$kernel" | grep -m 1 LOAD | awk '{print $7}'`
>  case "$platform" in
>  uboot)
>     rm -f "$ofile"
> -    mkimage -A ppc -O linux -T kernel -C gzip -a $membase -e $membase \
> +    ${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a $membase -e $membase \
>        $uboot_version -d "$vmz" "$ofile"
>     if [ -z "$cacheit" ]; then
>        rm -f "$vmz"
> @@ -327,7 +330,7 @@ coff)
>     ;;
>  cuboot*)
>     gzip -f -9 "$ofile"
> -    mkimage -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
> +    ${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
>             $uboot_version -d "$ofile".gz "$ofile"
>     ;;
>  treeboot*)
> --
> 1.6.2.1
>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
>

Patch

diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index 390512a..f4594ed 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -43,6 +43,9 @@  gzip=.gz
 # cross-compilation prefix
 CROSS=
 
+# mkimage wrapper script
+MKIMAGE=$srctree/scripts/mkuboot.sh
+
 # directory for object and other files used by this script
 object=arch/powerpc/boot
 objbin=$object
@@ -267,7 +270,7 @@  membase=`${CROSS}objdump -p "$kernel" | grep -m 1 LOAD | awk '{print $7}'`
 case "$platform" in
 uboot)
     rm -f "$ofile"
-    mkimage -A ppc -O linux -T kernel -C gzip -a $membase -e $membase \
+    ${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a $membase -e $membase \
 	$uboot_version -d "$vmz" "$ofile"
     if [ -z "$cacheit" ]; then
 	rm -f "$vmz"
@@ -327,7 +330,7 @@  coff)
     ;;
 cuboot*)
     gzip -f -9 "$ofile"
-    mkimage -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
+    ${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
             $uboot_version -d "$ofile".gz "$ofile"
     ;;
 treeboot*)