From owner-p4-projects@FreeBSD.ORG  Thu Nov  9 00:44:57 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 F3ADD16A4ED; Thu,  9 Nov 2006 00:44:56 +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 9F90916A407
	for <perforce@freebsd.org>; Thu,  9 Nov 2006 00:44:56 +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 6D46343D53
	for <perforce@freebsd.org>; Thu,  9 Nov 2006 00:44:56 +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 kA90iufh016881
	for <perforce@freebsd.org>; Thu, 9 Nov 2006 00:44:56 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA90iuF9016878
	for perforce@freebsd.org; Thu, 9 Nov 2006 00:44:56 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 9 Nov 2006 00:44:56 GMT
Message-Id: <200611090044.kA90iuF9016878@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 109584 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, 09 Nov 2006 00:44:57 -0000

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

Change 109584 by imp@imp_lighthouse on 2006/11/09 00:44:21

	Touch the right eeprom for the KB920x boards

Affected files ...

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

Differences ...

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

@@ -5,7 +5,6 @@
 
 #include "emac.h"
 #include "lib.h"
-#include "ee.h"
 #include "board.h"
 
 extern unsigned char mac[];
@@ -15,10 +14,10 @@
 {	
 	uint32_t sig;
 	sig = 0;
-	EERead(12 * 1024, (uint8_t *)&sig, sizeof(sig));
+	ReadEEPROM(12 * 1024, (uint8_t *)&sig, sizeof(sig));
 	if (sig != 0xaa55aa55)
 		return;
-	EERead(12 * 1024 + 4, mac, 6);
+	ReadEEPROM(12 * 1024 + 4, mac, 6);
 	printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0],
 	  mac[1], mac[2], mac[3], mac[4], mac[5]);
 }
@@ -31,6 +30,6 @@
 void
 board_init(void)
 {
-    EEInit();
+    InitEEPROM();
     MacFromEE();
 }