From owner-p4-projects@FreeBSD.ORG  Mon Aug 21 20:07: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 8D8CF16A549; Mon, 21 Aug 2006 20:07: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 6725F16A4E2
	for <perforce@freebsd.org>; Mon, 21 Aug 2006 20:07:14 +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 EBAC343D72
	for <perforce@freebsd.org>; Mon, 21 Aug 2006 20:07:13 +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 k7LK7DFU037138
	for <perforce@freebsd.org>; Mon, 21 Aug 2006 20:07:13 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7LK7D1i037135
	for perforce@freebsd.org; Mon, 21 Aug 2006 20:07:13 GMT
	(envelope-from imp@freebsd.org)
Date: Mon, 21 Aug 2006 20:07:13 GMT
Message-Id: <200608212007.k7LK7D1i037135@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 104714 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, 21 Aug 2006 20:07:14 -0000

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

Change 104714 by imp@imp_lighthouse on 2006/08/21 20:07:11

	Initialize the SD card, the emac and try to actually read off
	the sd card.
	
	God save us all.

Affected files ...

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

Differences ...

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

@@ -26,7 +26,9 @@
 
 #include <stdarg.h>
 
+#include "emac.h"
 #include "lib.h"
+#include "sd-card.h"
 
 #define SECOND		18	/* Circa that many ticks in a second. */
 
@@ -98,6 +100,8 @@
     RBX_VERBOSE
 };
 
+unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 };
+
 int dsk_start;
 static char cmd[512];
 static char kname[1024];
@@ -184,6 +188,10 @@
     int autoboot;
     ino_t ino;
 
+    EMAC_Init();
+    sdcard_init();
+    EMAC_SetMACAddress(mac);
+
     dmadat = (void *)(0x20000000 + (1 << 20));
     /* Process configuration file */
 
@@ -339,6 +347,5 @@
 
     if (!OPT_CHECK(RBX_QUIET))
 	printf("%c\b", c = c << 8 | c >> 24);
-    // XXX actually read here!
-    return -1;
+    return (MCI_read((char *)buf, lba << 9, nblk << 9));
 }