From owner-p4-projects@FreeBSD.ORG  Wed Jun 14 23:50:36 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 8D4D616A474; Wed, 14 Jun 2006 23:50:36 +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 53EFD16A47A
	for <perforce@freebsd.org>; Wed, 14 Jun 2006 23:50:36 +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 22A7B43D45
	for <perforce@freebsd.org>; Wed, 14 Jun 2006 23:50:36 +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 k5ENoaon058458
	for <perforce@freebsd.org>; Wed, 14 Jun 2006 23:50:36 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5ENoZE2058455
	for perforce@freebsd.org; Wed, 14 Jun 2006 23:50:35 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 14 Jun 2006 23:50:35 GMT
Message-Id: <200606142350.k5ENoZE2058455@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 99265 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, 14 Jun 2006 23:50:36 -0000

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

Change 99265 by imp@imp_lighthouse on 2006/06/14 23:49:59

	Enough random hacks to get ramMonitor loading on the TCS board
	from the sd card.

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/bootsd/main.c#3 edit

Differences ...

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

@@ -76,26 +76,44 @@
 
 unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 };
 
+#define REAL
 int
 main(void)
 {
 	unsigned	low_addr, high_addr;
+#ifdef REAL
+	int i;
+#endif
 
-	printf("\r\nTSC SD Card boot...\r\n");
+	printf("\r\nTSC boot...\r\n");
 	SPI_InitFlash();
 #ifdef TSC_FPGA
+	printf("Loading FPGA...");
 	AT91C_BASE_PIOC->PIO_PER = AT91C_PIO_PC7;
 	AT91C_BASE_PIOC->PIO_OER = AT91C_PIO_PC7;
 	AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC7;
 	fpga_load();
 	AT91C_BASE_PIOC->PIO_SODR = AT91C_PIO_PC7;
+	printf("done\r\n");
 #endif
 	EMAC_Init();
 	sdcard_init();
 	low_addr = (mac[3] << 24) | (mac[2] << 16) | (mac[1] << 8) | mac[0];
 	high_addr = (mac[5] << 8) | mac[4];
 	SetMACAddress(low_addr, high_addr);
-	MCI_read((char *)0x20000000, 0, 16 << 20);
-	((void(*)())0x20000000)();
+	printf("Reading from card...");
+#ifdef REAL
+	for (i = 0; i < 7; i++) 
+	{
+	    MCI_read((char *)0x20000000 + ((i + 1) << 20), i << 20, 1 << 20);
+	    printf("*");
+	}
+	printf("\r\nStarting...\r\n");
+	((void(*)())(0x20000000 + (1 << 20)))();
+#else
+	MCI_read((char *)0x20000000, 0, 1 << 20);
+	printf("Found %s\r\n", (char *)0x20000000);
+	while (1);
+#endif
 	return (1);
 }