Date: Sat, 16 Feb 2008 22:57:06 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 135531 for review Message-ID: <200802162257.m1GMv6q0064609@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=135531 Change 135531 by marcel@marcel_xcllnt on 2008/02/16 22:56:13 Resolve merge... Affected files ... .. //depot/projects/e500/sys/boot/powerpc/uboot/Makefile#7 edit .. //depot/projects/e500/sys/boot/powerpc/uboot/conf.c#4 edit .. //depot/projects/e500/sys/boot/powerpc/uboot/help.uboot#3 edit .. //depot/projects/e500/sys/boot/powerpc/uboot/ldscript.powerpc#3 edit .. //depot/projects/e500/sys/boot/powerpc/uboot/metadata.c#4 edit .. //depot/projects/e500/sys/boot/powerpc/uboot/start.S#5 edit .. //depot/projects/e500/sys/boot/powerpc/uboot/version#4 edit Differences ... ==== //depot/projects/e500/sys/boot/powerpc/uboot/Makefile#7 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.18 2004/12/21 12:32:15 ru Exp $ +# $FreeBSD: src/sys/boot/powerpc/uboot/Makefile,v 1.1 2008/02/16 22:40:55 marcel Exp $ PROG= loader -NEWVERSWHAT= "bootstrap loader" "U-Boot/PowerPC" +NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH} BINDIR?= /boot INSTALLFLAGS= -b ==== //depot/projects/e500/sys/boot/powerpc/uboot/conf.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/powerpc/loader/conf.c,v 1.10 2004/01/04 23:21:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/powerpc/uboot/conf.c,v 1.1 2008/02/16 22:40:55 marcel Exp $"); #include <stand.h> #include "bootstrap.h" ==== //depot/projects/e500/sys/boot/powerpc/uboot/help.uboot#3 (text+ko) ==== @@ -1,1 +1,1 @@ -$FreeBSD: src/sys/boot/powerpc/loader/help.ofw,v 1.1 2000/10/16 10:46:16 obrien Exp $ +$FreeBSD: src/sys/boot/powerpc/uboot/help.uboot,v 1.1 2008/02/16 22:40:55 marcel Exp $ ==== //depot/projects/e500/sys/boot/powerpc/uboot/ldscript.powerpc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/powerpc/loader/ldscript.powerpc,v 1.1 2004/07/08 12:52:35 grehan Exp $ */ +/* $FreeBSD: src/sys/boot/powerpc/uboot/ldscript.powerpc,v 1.1 2008/02/16 22:40:55 marcel Exp $ */ OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc") OUTPUT_ARCH(powerpc) ==== //depot/projects/e500/sys/boot/powerpc/uboot/metadata.c#4 (text+ko) ==== @@ -23,12 +23,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * from: FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.6 */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/powerpc/loader/metadata.c,v 1.5.2.1 2006/02/14 06:20:16 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/powerpc/uboot/metadata.c,v 1.1 2008/02/16 22:40:55 marcel Exp $"); #include <stand.h> #include <sys/param.h> ==== //depot/projects/e500/sys/boot/powerpc/uboot/start.S#5 (text+ko) ==== @@ -24,6 +24,9 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/powerpc/uboot/start.S,v 1.1 2008/02/16 22:40:55 marcel Exp $"); + #include <machine/asm.h> #define STACK_SIZE 8192 ==== //depot/projects/e500/sys/boot/powerpc/uboot/version#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/boot/powerpc/loader/version,v 1.1 2000/10/16 10:46:16 obrien Exp $ +$FreeBSD: src/sys/boot/powerpc/uboot/version,v 1.1 2008/02/16 22:40:55 marcel Exp $ NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this file is important. Make sure the current version number is on line 6.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802162257.m1GMv6q0064609>