From owner-p4-projects@FreeBSD.ORG  Mon Dec 11 23:24:38 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 DA06116A579; Mon, 11 Dec 2006 23:24:37 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B88F416A575
	for <perforce@freebsd.org>; Mon, 11 Dec 2006 23:24:37 +0000 (UTC)
	(envelope-from ticso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 58E5043CAA
	for <perforce@freebsd.org>; Mon, 11 Dec 2006 23:23:18 +0000 (GMT)
	(envelope-from ticso@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 kBBNOH5U028246
	for <perforce@freebsd.org>; Mon, 11 Dec 2006 23:24:17 GMT
	(envelope-from ticso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBNOHHk028243
	for perforce@freebsd.org; Mon, 11 Dec 2006 23:24:17 GMT
	(envelope-from ticso@freebsd.org)
Date: Mon, 11 Dec 2006 23:24:17 GMT
Message-Id: <200612112324.kBBNOHHk028243@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ticso@freebsd.org using -f
From: Bernd Walter <ticso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 111513 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: Mon, 11 Dec 2006 23:24:38 -0000

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

Change 111513 by ticso@ticso on 2006/12/11 23:23:21

	No need to #ifdef other boards in this file

Affected files ...

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

Differences ...

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

@@ -9,28 +9,14 @@
 #include "board.h"
 #include "sd-card.h"
 
-unsigned char mac[6] = { 0x00, 0x0e, 0x42, 02, 0, 21 };
-
-#define KLUDGE_STRAP
+unsigned char mac[6];
 
 static void
 MacFromEE()
 {	
 #if 0
 	uint32_t sig;
-#ifdef KLUDGE_STRAP
-	uint8_t euid64[8] = { 0x00, 0x30, 0x96, 0x20,
-			      0x00, 0x00, 0x00, 0x03 };
-#endif
 
-#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));
 	if (sig != 0xaa55aa55)
@@ -38,21 +24,12 @@
 	EERead(48, mac, 3);
 	EERead(48+5, mac+3, 3);
 #else
-#ifdef BOOT_BWCT
 	mac[0] = 0x00;
 	mac[1] = 0x0e;
 	mac[2] = 0x42;
 	mac[3] = 0x02;
 	mac[4] = 0x00;
 	mac[5] = 0x21;
-#else
-	mac[0] = 0;
-	mac[1] = 0x30;
-	mac[2] = 0x96;
-	mac[3] = 0;
-	mac[4] = 0;
-	mac[5] = 3;
-#endif
 #endif
 	printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0],
 	  mac[1], mac[2], mac[3], mac[4], mac[5]);