From owner-p4-projects@FreeBSD.ORG  Tue Aug  8 22:09:45 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 23F8816A4DD; Tue,  8 Aug 2006 22:09:44 +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 A068316A4E5
	for <perforce@freebsd.org>; Tue,  8 Aug 2006 22:09:44 +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 7219E43D46
	for <perforce@freebsd.org>; Tue,  8 Aug 2006 22:09:44 +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 k78M9iFu060180
	for <perforce@freebsd.org>; Tue, 8 Aug 2006 22:09:44 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k78M9iPF060177
	for perforce@freebsd.org; Tue, 8 Aug 2006 22:09:44 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 8 Aug 2006 22:09:44 GMT
Message-Id: <200608082209.k78M9iPF060177@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 103476 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, 08 Aug 2006 22:09:45 -0000

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

Change 103476 by imp@imp_lighthouse on 2006/08/08 22:08:57

	Only do the watchdog for automated boot
	Boot from SPI part

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#5 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#15 edit

Differences ...

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

@@ -109,11 +109,17 @@
 	.string "e 0x10000000                           "
 	.string "                 "
 #else
+#if 0
 	.string "Bootloader for KB9202 Evaluation Board."
 	.string "m 42 53 44 0 0 1                       "
 	.string "ip 206 168 13 194                      "
 	.string "server_ip 206 168 13 207               "
 	.string "tftp 0x20000000 kernel.bin             "
 	.string "e 0x20000000                           "
+#else
+	.string "m 42 53 44 0 0 1"
+	.string "k 0x20000000"
+	.string "e 0x20000000"
+#endif
 	.word	0
 #endif

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

@@ -53,10 +53,11 @@
 	fpga_load();
 #endif
 	EMAC_Init();
-	start_wdog(30);
 	LoadBootCommands();
-	if (getc(1) == -1)
+	if (getc(1) == -1) {
+		start_wdog(30);
 		ExecuteEnvironmentFunctions();
+	}
 	Bootloader(getc);
 	return (1);
 }