From owner-p4-projects@FreeBSD.ORG  Tue Apr 25 17:10:58 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 6E2B616A402; Tue, 25 Apr 2006 17:10:58 +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 363FC16A401
	for <perforce@freebsd.org>; Tue, 25 Apr 2006 17:10:58 +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 0219643D46
	for <perforce@freebsd.org>; Tue, 25 Apr 2006 17:10:58 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3PHAvxe038795
	for <perforce@freebsd.org>; Tue, 25 Apr 2006 17:10:57 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3PHAvuP038789
	for perforce@freebsd.org; Tue, 25 Apr 2006 17:10:57 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 25 Apr 2006 17:10:57 GMT
Message-Id: <200604251710.k3PHAvuP038789@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 96071 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: Tue, 25 Apr 2006 17:10:58 -0000

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

Change 96071 by imp@imp_hammer on 2006/04/25 17:10:54

	I'm wearing out the damn reset button, put reset at the end of
	this test routine until I get things working...

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#6 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#10 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.h#8 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/reset.c#1 add

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#6 (text) ====

@@ -62,7 +62,7 @@
 		if (p_memcmp(addr3, addr2, len) != 0) {
 			printf("Readback failed:\r\n");
 			for (i = 0; i < 75; i++)
-				printf("%x ", addr[i]);
+				printf("%x ", addr3[i]);
 			printf("\r\n----------\r\n");
 			for (i = 0; i < 75; i++)
 				printf("%x ", addr2[i]);
@@ -73,6 +73,7 @@
 //		while (GetSeconds() < this_sec)
 //			continue;
 //	}
+		reset();
 #endif
 	return (1);
 }

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

@@ -5,7 +5,7 @@
 LIB=		at91
 INTERNALLIB=
 SRCS=at91rm9200_lowlevel.c eeprom.c emac.c env_vars.c getc.c loader_prompt.c \
-	p_string.c putchar.c printf.c spi_flash.c xmodem.c
+	p_string.c putchar.c printf.c reset.c spi_flash.c xmodem.c
 NO_MAN=
 
 .if ${MK_TAG_LIST} != "no"

==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.h#8 (text) ====

@@ -40,4 +40,7 @@
 /* XMODEM protocol */
 int xmodem_rx(char *dst);
 
+/* Reboot! Reset! */
+void reset(void);
+
 #endif