All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Tyser <ptyser@xes-inc.com>
To: linuxppc-dev@ozlabs.org
Cc: linux-kbuild@vger.kernel.org, Peter Tyser <ptyser@xes-inc.com>
Subject: [PATCH v2 1/3] powerpc: Use scripts/mkuboot.sh instead of 'mkimage'
Date: Mon, 21 Dec 2009 19:50:41 -0600	[thread overview]
Message-ID: <1261446643-21714-2-git-send-email-ptyser@xes-inc.com> (raw)
In-Reply-To: <1261446643-21714-1-git-send-email-ptyser@xes-inc.com>

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(-)

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


WARNING: multiple messages have this Message-ID (diff)
From: Peter Tyser <ptyser@xes-inc.com>
To: linuxppc-dev@ozlabs.org
Cc: Peter Tyser <ptyser@xes-inc.com>, linux-kbuild@vger.kernel.org
Subject: [PATCH v2 1/3] powerpc: Use scripts/mkuboot.sh instead of 'mkimage'
Date: Mon, 21 Dec 2009 19:50:41 -0600	[thread overview]
Message-ID: <1261446643-21714-2-git-send-email-ptyser@xes-inc.com> (raw)
In-Reply-To: <1261446643-21714-1-git-send-email-ptyser@xes-inc.com>

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(-)

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

  reply	other threads:[~2009-12-22  1:50 UTC|newest]

Thread overview: 75+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-22  1:50 [PATCH v2 0/3] powerpc: Add support for FIT uImages Peter Tyser
2009-12-22  1:50 ` Peter Tyser
2009-12-22  1:50 ` Peter Tyser [this message]
2009-12-22  1:50   ` [PATCH v2 1/3] powerpc: Use scripts/mkuboot.sh instead of 'mkimage' Peter Tyser
2009-12-30 22:25   ` Grant Likely
2009-12-30 22:25     ` Grant Likely
2009-12-22  1:50 ` [PATCH v2 2/3] powerpc: Add support for creating FIT uImages Peter Tyser
2009-12-22  1:50   ` Peter Tyser
2009-12-22  3:48   ` Olof Johansson
2009-12-22  4:50     ` Peter Tyser
2009-12-30 22:57   ` Grant Likely
2009-12-30 22:57     ` Grant Likely
2010-01-01 14:18     ` Wolfgang Denk
2010-01-01 14:18       ` Wolfgang Denk
2010-01-03  5:23       ` Grant Likely
2010-01-03  5:23         ` Grant Likely
2009-12-22  1:50 ` [PATCH v2 3/3] powerpc: Add support for ram filesystems in " Peter Tyser
2009-12-22  1:50   ` Peter Tyser
2009-12-30 23:02   ` Grant Likely
2009-12-30 23:02     ` Grant Likely
2009-12-30 23:39     ` Peter Tyser
2009-12-30 23:39       ` [U-Boot] " Peter Tyser
2009-12-30 23:39       ` Peter Tyser
2009-12-31  0:01       ` Grant Likely
2009-12-31  0:01         ` [U-Boot] " Grant Likely
2009-12-31  0:01         ` Grant Likely
2009-12-31  1:10         ` Peter Tyser
2009-12-31  1:10           ` [U-Boot] " Peter Tyser
2009-12-31  1:10           ` Peter Tyser
2010-01-03  5:08           ` [U-Boot] " Grant Likely
2010-01-03  5:08             ` Grant Likely
2010-01-03  5:08             ` Grant Likely
2010-01-03 10:10             ` Wolfgang Denk
2010-01-03 10:10               ` Wolfgang Denk
2010-01-03 10:10               ` Wolfgang Denk
2010-01-04  1:07               ` Peter Tyser
2010-01-04  1:07                 ` Peter Tyser
2010-01-04  1:07                 ` Peter Tyser
2010-01-04  8:27               ` Grant Likely
2010-01-04  8:27                 ` Grant Likely
2010-01-04  8:27                 ` Grant Likely
2009-12-31  8:01         ` Peter Korsgaard
2009-12-31  8:01           ` [U-Boot] " Peter Korsgaard
2009-12-31  8:01           ` Peter Korsgaard
2010-01-01 14:12         ` Wolfgang Denk
2010-01-01 14:12           ` [U-Boot] " Wolfgang Denk
2010-01-01 14:12           ` Wolfgang Denk
2010-01-03  5:18           ` Grant Likely
2010-01-03  5:18             ` [U-Boot] " Grant Likely
2010-01-03  5:18             ` Grant Likely
2010-01-03 10:15             ` Wolfgang Denk
2010-01-03 10:15               ` [U-Boot] " Wolfgang Denk
2010-01-03 10:15               ` Wolfgang Denk
2009-12-31 22:44     ` Wolfgang Denk
2009-12-31 22:44       ` Wolfgang Denk
2009-12-31 23:10       ` Peter Tyser
2009-12-31 23:10         ` Peter Tyser
2010-01-01 10:44         ` Wolfgang Denk
2010-01-01 10:44           ` Wolfgang Denk
2010-01-03  5:13           ` Grant Likely
2010-01-03  5:13             ` Grant Likely
2010-01-03 10:12             ` Wolfgang Denk
2010-01-03 10:12               ` Wolfgang Denk
2010-01-03  8:06           ` Peter Korsgaard
2010-01-03  8:06             ` Peter Korsgaard
2010-01-03  9:50             ` Wolfgang Denk
2010-01-03  9:50               ` Wolfgang Denk
2010-01-03 14:27               ` Peter Korsgaard
2010-01-03 14:27                 ` Peter Korsgaard
2010-01-04  8:34                 ` Grant Likely
2010-01-04  8:34                   ` Grant Likely
2010-01-03 23:52           ` Peter Tyser
2010-01-03 23:52             ` Peter Tyser
2010-01-03  5:10       ` Grant Likely
2010-01-03  5:10         ` Grant Likely

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1261446643-21714-2-git-send-email-ptyser@xes-inc.com \
    --to=ptyser@xes-inc.com \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.