From owner-p4-projects@FreeBSD.ORG  Thu Apr 27 22:44:35 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 E1C7D16A455; Thu, 27 Apr 2006 22:44:34 +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 B388716A453
	for <perforce@freebsd.org>; Thu, 27 Apr 2006 22:44:34 +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 8228243D6B
	for <perforce@freebsd.org>; Thu, 27 Apr 2006 22:44:33 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3RMiX4d056878
	for <perforce@freebsd.org>; Thu, 27 Apr 2006 22:44:33 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3RMiXg5056875
	for perforce@freebsd.org; Thu, 27 Apr 2006 22:44:33 GMT
	(envelope-from imp@freebsd.org)
Date: Thu, 27 Apr 2006 22:44:33 GMT
Message-Id: <200604272244.k3RMiXg5056875@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 96268 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, 27 Apr 2006 22:44:35 -0000

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

Change 96268 by imp@imp_hammer on 2006/04/27 22:44:03

	Now that we can write to the SPI flash, kill debugging code.

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#7 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#7 (text) ====

@@ -33,47 +33,23 @@
 int
 main(void)
 {
+	int len;
 	char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */
-	int len, i;
-#if 1
 	char *addr2 = (char *)SDRAM_BASE + (2 << 20); /* Load to base + 2MB */
 	char *addr3 = (char *)SDRAM_BASE + (3 << 20); /* Load to base + 2MB */
-#endif
-//	unsigned this_sec;
 
 	SPI_InitFlash();
-#if 0
 	while ((len = xmodem_rx(addr)) == -1)
 		continue;
-#else
-	len = FLASH_PAGE_SIZE;
-	for (i = 0; i < FLASH_PAGE_SIZE; i++)
-		addr[i] = i * 3;
-	SPI_GetId(&i);
-	printf("I is %x\r\n", i);
-#endif
-#if 1
-//	while (1) {
-		p_memcpy(addr3, addr, len);
-		printf("Writing %u bytes to flash\r\n", len);
-		SPI_WriteFlash(FLASH_PAGE_SIZE, addr, len);
-		printf("Reading back %u bytes from flash\r\n", len);
-		SPI_ReadFlash(FLASH_PAGE_SIZE, addr2, len);
-		if (p_memcmp(addr3, addr2, len) != 0) {
-			printf("Readback failed:\r\n");
-			for (i = 0; i < 75; i++)
-				printf("%x ", addr3[i]);
-			printf("\r\n----------\r\n");
-			for (i = 0; i < 75; i++)
-				printf("%x ", addr2[i]);
-			printf("\r\n");
-		} else
-			printf("Readback OK\r\n");
-//		this_sec = GetSeconds() + 1;
-//		while (GetSeconds() < this_sec)
-//			continue;
-//	}
-		reset();
-#endif
+	printf("Downloaded %u bytes.\r\n", len);
+	p_memcpy(addr3, addr, len);
+	printf("Writing %u bytes to flash\r\n", len);
+	SPI_WriteFlash(0, addr, len);
+	printf("Reading back %u bytes from flash\r\n", len);
+	SPI_ReadFlash(0, addr2, len);
+	if (p_memcmp(addr3, addr2, len) != 0)
+		printf("Readback failed\r\n");
+	else
+		printf("Readback OK\r\n");
 	return (1);
 }