From owner-p4-projects@FreeBSD.ORG  Fri Sep 15 17:20:23 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 7835316A47E; Fri, 15 Sep 2006 17:20:23 +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 54A9B16A417
	for <perforce@freebsd.org>; Fri, 15 Sep 2006 17:20:23 +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 81DAD43D77
	for <perforce@freebsd.org>; Fri, 15 Sep 2006 17:20:21 +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 k8FHKLnY020834
	for <perforce@freebsd.org>; Fri, 15 Sep 2006 17:20:21 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8FHKLxL020831
	for perforce@freebsd.org; Fri, 15 Sep 2006 17:20:21 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 15 Sep 2006 17:20:21 GMT
Message-Id: <200609151720.k8FHKLxL020831@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 106157 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: Fri, 15 Sep 2006 17:20:23 -0000

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

Change 106157 by imp@imp_lighthouse on 2006/09/15 17:19:50

	integrate

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#20 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/memcpy.c#1 branch
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/strcmp.c#1 branch

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#20 (text+ko) ====

@@ -180,6 +180,7 @@
 }
 #endif
 
+#ifdef BOOT_TSC
 static void
 MacFromEE()
 {	
@@ -204,6 +205,7 @@
 	printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0],
 	  mac[1], mac[2], mac[3], mac[4], mac[5]);
 }
+#endif
 
 int
 main(void)
@@ -212,11 +214,13 @@
     ino_t ino;
 
 #ifdef TSC_FPGA
-	SPI_InitFlash();
-	fpga_load();
+    SPI_InitFlash();
+    fpga_load();
 #endif
+#ifdef BOOT_TSC
     EEInit();
     MacFromEE();
+#endif
     EMAC_Init();
     sdcard_init();
     EMAC_SetMACAddress(mac);