From owner-p4-projects@FreeBSD.ORG  Thu Sep 14 18:08:14 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 03B4116A563; Thu, 14 Sep 2006 18:08:14 +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 D5FCD16A49E
	for <perforce@freebsd.org>; Thu, 14 Sep 2006 18:08:13 +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 8A84C43D6A
	for <perforce@freebsd.org>; Thu, 14 Sep 2006 18:08:08 +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 k8EI88Dg049505
	for <perforce@freebsd.org>; Thu, 14 Sep 2006 18:08:08 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8EI88Pc049502
	for perforce@freebsd.org; Thu, 14 Sep 2006 18:08:08 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 14 Sep 2006 18:08:08 GMT
Message-Id: <200609141808.k8EI88Pc049502@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 106106 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, 14 Sep 2006 18:08:14 -0000

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

Change 106106 by imp@imp_lighthouse on 2006/09/14 18:07:13

	#ifdef'd out code to write primitive euid64 to the eeprom.
	Fix code that reads it in.
	print mac address onboot, for now.

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#16 edit

Differences ...

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

@@ -205,20 +205,34 @@
 MacFromEE()
 {	
 	uint32_t sig;
+#if 0
+	uint8_t euid64[8] = { 0x00, 0x30, 0x96, 0x20,
+			      0x00, 0x00, 0x00, 0x05 };
+#else
 	uint8_t euid64[8];
+#endif
 
+#if 0
+	printf("writing...\n");
+	sig = 0xaa55aa55;
+	EEWrite(0, (uint8_t *)&sig, sizeof(sig));
+	EEWrite(48, euid64, sizeof(euid64));
+#endif
+	sig = 0;
 	EERead(0, (uint8_t *)&sig, sizeof(sig));
 	if (sig != 0xaa55aa55) {
 		printf("Bad signature %x\n", sig);
 		return;
 	}
-	EERead(48, euid64, 8);
+	EERead(48, euid64, sizeof(euid64));
 	mac[0] = euid64[0];
 	mac[1] = euid64[1];
-	mac[2] = euid64[4];
+	mac[2] = euid64[2];
 	mac[3] = euid64[5];
 	mac[4] = euid64[6];
-	mac[6] = euid64[7];
+	mac[5] = euid64[7];
+	printf("MAC Address %x:%x:%x:%x:%x:%x\n", mac[0],
+	  mac[1], mac[2], mac[3], mac[4], mac[5]);
 }
 
 int