From owner-p4-projects@FreeBSD.ORG  Thu Aug 17 00:10:52 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5D28D16A4DA; Thu, 17 Aug 2006 00:10:52 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3154016A4E1
	for <perforce@freebsd.org>; Thu, 17 Aug 2006 00:10:52 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5049C43D55
	for <perforce@freebsd.org>; Thu, 17 Aug 2006 00:10:51 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7H0ApZ3096055
	for <perforce@freebsd.org>; Thu, 17 Aug 2006 00:10:51 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7H0ApRB096052
	for perforce@freebsd.org; Thu, 17 Aug 2006 00:10:51 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 17 Aug 2006 00:10:51 GMT
Message-Id: <200608170010.k7H0ApRB096052@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 104330 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Aug 2006 00:10:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=104330

Change 104330 by imp@imp_lighthouse on 2006/08/17 00:10:37

	Get closer to FreeBSD-current

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/Makefile#11 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#6 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#18 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/Makefile#11 (text+ko) ====

@@ -1,4 +1,4 @@
-#  $FreeBSD: src/sys/boot/arm/at91/boot0spi/Makefile,v 1.2 2006/08/16 23:18:07 imp Exp $
+# $FreeBSD: src/sys/boot/arm/at91/Makefile,v 1.2 2006/04/21 06:43:32 imp Exp $
 
 SUBDIR=		libat91 boot0 boot0iic boot0spi boot2 bootiic bootspi bootsd
 

==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#6 (text+ko) ====

@@ -20,7 +20,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD: src/sys/boot/arm/at91/bootspi/arm_init.s,v 1.1 2006/04/19 17:16:48 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/bootspi/arm_init.S,v 1.1 2006/08/16 23:39:58 imp Exp $
  ******************************************************************************/
 
 	.equ	ARM_MODE_USER,	0x10

==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#18 (text+ko) ====

@@ -19,7 +19,7 @@
  * only.
  * END_BLOCK
  *
- * $FreeBSD: src/sys/boot/arm/at91/libat91/loader_prompt.c,v 1.2 2006/04/21 13:56:26 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/bootspi/loader_prompt.c,v 1.1 2006/08/16 23:39:58 imp Exp $
  *****************************************************************************/
 
 #include "at91rm9200_lowlevel.h"