From owner-p4-projects@FreeBSD.ORG  Wed May  3 23:18:49 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 9FEB616A403; Wed,  3 May 2006 23:18:49 +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 66A9916A401
	for <perforce@freebsd.org>; Wed,  3 May 2006 23:18:49 +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 2447143D49
	for <perforce@freebsd.org>; Wed,  3 May 2006 23:18:49 +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 k43NInq9029134
	for <perforce@freebsd.org>; Wed, 3 May 2006 23:18:49 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k43NImZ0029128
	for perforce@freebsd.org; Wed, 3 May 2006 23:18:48 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 3 May 2006 23:18:48 GMT
Message-Id: <200605032318.k43NImZ0029128@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 96633 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, 03 May 2006 23:18:49 -0000

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

Change 96633 by imp@imp_hammer on 2006/05/03 23:18:06

	xmodem download code was just debug

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#6 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.h#5 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#6 (text+ko) ====

@@ -67,7 +67,6 @@
 	{COMMAND_RESET, "R"},
 	{COMMAND_REPLACE_FLASH_VIA_XMODEM, "I"},
 	{COMMAND_REPLACE_FPGA_VIA_XMODEM, "F"},
-	{COMMAND_PROGRAM_FPGA_VIA_XMODEM, "f"},
 	{COMMAND_FINAL_FLAG, 0}
 };
 
@@ -227,21 +226,6 @@
 	}
 }
 
-static void
-ProgramFpga(void)
-{
-	char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */
-	int len;
-
-	while ((len = xmodem_rx(addr)) == -1)
-		continue;
-	printf("Loading %u bytes into the FPGA...\r\n", len);
-	fpga_init(&main_fpga);
-	fpga_clear(&main_fpga);
-	fpga_write_bytes(&main_fpga, addr, len);
-	fpga_done(&main_fpga);
-}
-
 /*
  * .KB_C_FN_DEFINITION_START
  * void ParseCommand(char *)
@@ -411,8 +395,6 @@
 		printf("Updating FLASH image\r\n");
 		UpdateFlash(0);
 		break;
-	case COMMAND_PROGRAM_FPGA_VIA_XMODEM:
-		ProgramFpga();
 	default:
 		break;
 	}

==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.h#5 (text+ko) ====

@@ -43,7 +43,6 @@
 	COMMAND_RESET,
 	COMMAND_REPLACE_FLASH_VIA_XMODEM,
 	COMMAND_REPLACE_FPGA_VIA_XMODEM,
-	COMMAND_PROGRAM_FPGA_VIA_XMODEM,
 	COMMAND_FINAL_FLAG
 } e_cmd_t;