public inbox for linuxppc-dev@ozlabs.org 
 help / color / mirror / Atom feed
From: Brian Waite <waite@skycomputers•com>
To: Steven Scholz <steven.scholz@imc-berlin•de>,
	Tom Rini <trini@kernel•crashing.org>
Cc: LinuxPPC <linuxppc-embedded@lists•linuxppc.org>
Subject: Re: BOOT_TARGET pImage & uImage ???
Date: Thu, 18 Sep 2003 09:52:29 -0400	[thread overview]
Message-ID: <200309180952.29699.waite@skycomputers.com> (raw)
In-Reply-To: <3F699255.4050000@imc-berlin.de>

[-- Attachment #1: clearsigned data --]
[-- Type: Text/Plain, Size: 639 bytes --]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Here  is the patch I have been using myself. I am embarrassed to say that I 
was the 2nd person to ask and I forgot to post the patch for inclusion. I 
don;t have a version for 2.5/6 but this works for 2.4 (based on 
2.4.22-pre10). Tom, I am not sure this is exactly what yoou wanted when we 
initially talked about it so let me know if you would like a better method.


Thanks
Brian
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE/abidmxLCz0u+Ko8RApSeAJ9FwwirTLp5lYIeoVwOs3olE11CDACeM7Zs
oiWo6RqxHhkLubrg8YbELqI=
=s7cT
-----END PGP SIGNATURE-----

[-- Attachment #2: uboot.patch --]
[-- Type: text/x-diff, Size: 2982 bytes --]

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux 2.4 for PowerPC development tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1350  -> 1.1351
#	   arch/ppc/Makefile	1.57    -> 1.58
#	arch/ppc/boot/images/Makefile	1.6     -> 1.7
#	arch/ppc/boot/Makefile	1.49    -> 1.50
#	               (new)	        -> 1.1     scripts/mkuboot.sh
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/08/07	waite@dayton•sky	1.1351
# U
# --------------------------------------------
#
diff -Nru a/arch/ppc/Makefile b/arch/ppc/Makefile
--- a/arch/ppc/Makefile	Thu Sep 18 09:45:53 2003
+++ b/arch/ppc/Makefile	Thu Sep 18 09:45:53 2003
@@ -98,7 +98,7 @@
 checks:
 	@$(MAKE) -C arch/$(ARCH)/kernel checks

-BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd
+BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd uImage

 # All the instructions talk about "make bzImage".
 bzImage: zImage
diff -Nru a/arch/ppc/boot/Makefile b/arch/ppc/boot/Makefile
--- a/arch/ppc/boot/Makefile	Thu Sep 18 09:45:53 2003
+++ b/arch/ppc/boot/Makefile	Thu Sep 18 09:45:53 2003
@@ -17,7 +17,7 @@
 AFLAGS	+= -D__BOOTER__
 OBJCOPY_ARGS = -O elf32-powerpc

-MKIMAGE				:= ./utils/mkimage.wrapper
+MKIMAGE				:= $(TOPDIR)/scripts/mkuboot.sh

 lib/zlib.a: lib/zlib.c
 	$(MAKE) -C lib
@@ -67,12 +67,18 @@
 	gzip $(GZIP_FLAGS) images/vmapus
 endif

+mkuboot: $(MKIMAGE)
+	cp $< $@
+	chmod 755 $@
+
+
 # Make an image for PPCBoot
-pImage: images/vmlinux.gz
-	$(MKIMAGE) -A ppc -O linux -T kernel -C gzip -a 00000000 -e 00000000 \
+uImage: images/vmlinux.gz mkuboot
+	./mkuboot -A ppc -O linux -T kernel -C gzip -a 00000000 -e 00000000 \
 	-n 'Linux-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)' \
-	-d $< images/vmlinux.PPCBoot
-	ln -sf vmlinux.PPCBoot images/pImage
+	-d $< images/vmlinux.UBoot
+	ln -sf vmlinux.UBoot images/uImage
+	rm -f ./mkuboot

 # These are subdirs with files not normally rm'ed. -- Tom
 clean:
diff -Nru a/arch/ppc/boot/images/Makefile b/arch/ppc/boot/images/Makefile
--- a/arch/ppc/boot/images/Makefile	Thu Sep 18 09:45:53 2003
+++ b/arch/ppc/boot/images/Makefile	Thu Sep 18 09:45:53 2003
@@ -9,4 +9,4 @@
 	gzip -vf9 vmlinux

 clean:
-	rm -f sImage vmapus vmlinux* miboot* zImage* zvmlinux*
+	rm -f sImage vmapus vmlinux* miboot* zImage* zvmlinux* uImage
diff -Nru a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile
diff -Nru a/scripts/mkuboot.sh b/scripts/mkuboot.sh
--- /dev/null	Wed Dec 31 16:00:00 1969
+++ b/scripts/mkuboot.sh	Thu Sep 18 09:45:53 2003
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+#
+# Build U-Boot image when `mkimage' tool is available.
+#
+
+MKIMAGE=$(type -path mkimage)
+
+if [ -z "${MKIMAGE}" ]; then
+	# Doesn't exist
+	echo '"mkimage" command not found - U-Boot images will not be built' >&2
+	exit 0;
+fi
+
+# Call "mkimage" to create U-Boot image
+${MKIMAGE} "$@"

  reply	other threads:[~2003-09-18 13:52 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-09-15 10:16 BOOT_TARGET pImage & uImage ??? Steven Scholz
2003-09-15 15:09 ` Tom Rini
2003-09-18 11:09   ` Steven Scholz
2003-09-18 13:52     ` Brian Waite [this message]
2003-09-18 18:31       ` Tom Rini
2003-09-18 18:08     ` Tom Rini
2003-09-18 18:22       ` Brian Waite
2003-09-18 18:28         ` Tom Rini
2003-09-18 18:40         ` Wolfgang Denk
2003-09-18 18:26       ` Sam Ravnborg
2003-09-18 18:33         ` Tom Rini
2003-09-18 19:38           ` Sam Ravnborg
2003-09-18 20:07             ` Wolfgang Denk

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=200309180952.29699.waite@skycomputers.com \
    --to=waite@skycomputers$(echo .)com \
    --cc=linuxppc-embedded@lists$(echo .)linuxppc.org \
    --cc=steven.scholz@imc-berlin$(echo .)de \
    --cc=trini@kernel$(echo .)crashing.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox