From owner-p4-projects@FreeBSD.ORG  Wed Aug 16 23:10:28 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 3F9C916A4E1; Wed, 16 Aug 2006 23:10:28 +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 1A79916A4DF
	for <perforce@freebsd.org>; Wed, 16 Aug 2006 23:10:28 +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 D994A43D46
	for <perforce@freebsd.org>; Wed, 16 Aug 2006 23:10:27 +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 k7GNARhV091051
	for <perforce@freebsd.org>; Wed, 16 Aug 2006 23:10:27 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GNARuX091048
	for perforce@freebsd.org; Wed, 16 Aug 2006 23:10:27 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 16 Aug 2006 23:10:27 GMT
Message-Id: <200608162310.k7GNARuX091048@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 104314 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, 16 Aug 2006 23:10:28 -0000

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

Change 104314 by imp@imp_lighthouse on 2006/08/16 23:09:53

	Cleanup

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/doit.c#5 delete
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#13 edit

Differences ...

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

@@ -30,17 +30,6 @@
 #include "spi_flash.h"
 #include "fpga.h"
 
-struct fpga main_fpga = 
-{
-    AT91C_BASE_PIOB, AT91C_PIO_PB0,
-    AT91C_BASE_PIOC, AT91C_PIO_PC11,
-    AT91C_BASE_PIOB, AT91C_PIO_PB2,
-    AT91C_BASE_PIOC, AT91C_PIO_PC12
-};
-
-#define BURN_FPGA 1
-
-//#define OFFSET (15 * FLASH_PAGE_SIZE)
 #define OFFSET 0
 
 int
@@ -48,16 +37,13 @@
 {
 	int len, i, j, off;
 	char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */
-#ifdef BURN_FPGA
 	char *addr2 = (char *)SDRAM_BASE + (2 << 20); /* Load to base + 2MB */
 	char *addr3 = (char *)SDRAM_BASE + (3 << 20); /* Load to base + 2MB */
-#endif
 
 	SPI_InitFlash();
 	printf("Waiting for data\r\n");
 	while ((len = xmodem_rx(addr)) == -1)
 		continue;
-#ifdef BURN_FPGA
 	printf("\r\nDownloaded %u bytes.\r\n", len);
 	p_memcpy(addr3, addr, (len + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE * FLASH_PAGE_SIZE);
 	printf("Writing %u bytes to flash at %u\r\n", len, OFFSET);
@@ -72,14 +58,5 @@
 		if (j >= 10)
 			printf("Bad Readback at %u\r\n", i);
 	}
-#else
-	len = 212482;
-	SPI_ReadFlash(15 * FLASH_PAGE_SIZE, addr, len);
-	printf("Downloaded %u bytes...  burning FPGA...\r\n", len);
-	fpga_init(&main_fpga);
-	fpga_clear(&main_fpga);
-	fpga_write_bytes(&main_fpga, addr, len);
-	fpga_done(&main_fpga);
-#endif
 	return (1);
 }