From owner-p4-projects@FreeBSD.ORG  Wed Nov 15 22:34:19 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 BEB3916A417; Wed, 15 Nov 2006 22:34:19 +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 853D516A415
	for <perforce@freebsd.org>; Wed, 15 Nov 2006 22:34:19 +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 4636043D7F
	for <perforce@freebsd.org>; Wed, 15 Nov 2006 22:34:12 +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 kAFMYCRh097565
	for <perforce@freebsd.org>; Wed, 15 Nov 2006 22:34:12 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAFMYBaK097562
	for perforce@freebsd.org; Wed, 15 Nov 2006 22:34:11 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 15 Nov 2006 22:34:11 GMT
Message-Id: <200611152234.kAFMYBaK097562@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 110069 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: Wed, 15 Nov 2006 22:34:20 -0000

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

Change 110069 by imp@imp_lighthouse on 2006/11/15 22:34:02

	More ways to kludge this bodger together.

Affected files ...

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

Differences ...

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

@@ -10,6 +10,7 @@
 
 extern unsigned char mac[];
 
+#define KLUDGE_STRAP
 #define TSC_FPGA
 #define XMODEM_DL
 
@@ -53,17 +54,20 @@
 static void
 MacFromEE()
 {	
+#if 0
 	uint32_t sig;
-#if 0
+#ifdef KLUDGE_STRAP
 	uint8_t euid64[8] = { 0x00, 0x30, 0x96, 0x20,
-			      0x00, 0x00, 0x00, 0x07 };
+			      0x00, 0x00, 0x00, 0x03 };
 #endif
 
-#if 0
+#ifdef KLUDGE_STRAP
 	printf("writing...\n");
 	sig = 0xaa55aa55;
 	EEWrite(0, (uint8_t *)&sig, sizeof(sig));
+	printf("euid64\n");
 	EEWrite(48, euid64, sizeof(euid64));
+	printf("done\n");
 #endif
 	sig = 0;
 	EERead(0, (uint8_t *)&sig, sizeof(sig));
@@ -71,6 +75,14 @@
 		return;
 	EERead(48, mac, 3);
 	EERead(48+5, mac+3, 3);
+#else
+	mac[0] = 0;
+	mac[1] = 0x30;
+	mac[2] = 0x96;
+	mac[3] = 0;
+	mac[4] = 0;
+	mac[5] = 3;
+#endif
 	printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0],
 	  mac[1], mac[2], mac[3], mac[4], mac[5]);
 }
@@ -116,8 +128,11 @@
     SPI_InitFlash();
     fpga_load();
 #endif
+    printf("EEinit\n");
     EEInit();
+    printf("mac\n");
     MacFromEE();
+    printf("EEEEEE\n");
 }
 
 #include "../bootspi/ee.c"