From owner-p4-projects@FreeBSD.ORG  Sat May 20 06:14:56 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 BDE9716A425; Sat, 20 May 2006 06:14:56 +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 7BDE216A41F
	for <perforce@freebsd.org>; Sat, 20 May 2006 06:14:56 +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 2ED1343D49
	for <perforce@freebsd.org>; Sat, 20 May 2006 06:14:56 +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 k4K6ENp1010826
	for <perforce@freebsd.org>; Sat, 20 May 2006 06:14:24 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4K6ENoX010823
	for perforce@freebsd.org; Sat, 20 May 2006 06:14:23 GMT
	(envelope-from imp@freebsd.org)
Date: Sat, 20 May 2006 06:14:23 GMT
Message-Id: <200605200614.k4K6ENoX010823@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 97498 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: Sat, 20 May 2006 06:14:57 -0000

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

Change 97498 by imp@imp_plunger on 2006/05/20 06:13:53

	Trim a little more fat, in anticipation of the sd card support.

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#8 edit

Differences ...

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

@@ -26,9 +26,6 @@
 #include "at91rm9200.h"
 #include "p_string.h"
 #include "eeprom.h"
-#ifdef SUPPORT_TAG_LIST
-#include "tag_list.h"
-#endif
 #include "emac.h"
 #include "loader_prompt.h"
 #include "env_vars.h"
@@ -52,14 +49,10 @@
 static const command_entry_t	CommandTable[] = {
 	{COMMAND_DUMP, "d"},
 	{COMMAND_EXEC, "e"},
-	{COMMAND_HELP, "?"},
 	{COMMAND_LOCAL_IP, "ip"},
 	{COMMAND_MAC, "m"},
 	{COMMAND_SERVER_IP, "server_ip"},
 	{COMMAND_SET, "s"},
-#ifdef SUPPORT_TAG_LIST
-	{COMMAND_TAG, "t"},
-#endif
 	{COMMAND_TFTP, "tftp"},
 	{COMMAND_WRITE, "w"},
 	{COMMAND_XMODEM, "x"},
@@ -69,8 +62,6 @@
 	{COMMAND_FINAL_FLAG, 0}
 };
 
-static unsigned tagAddress;
-
 #ifdef TSC_FPGA
 #include "fpga.h"
 
@@ -237,13 +228,13 @@
 	{
 		// "e <address>"
 		// execute at address
-		void (*execAddr)(unsigned, unsigned, unsigned);
+		void (*execAddr)(unsigned, unsigned);
 
 		if (argc > 1) {
 			/* in future, include machtypes (MACH_KB9200 = 612) */
-			execAddr = (void (*)(unsigned, unsigned, unsigned))
-			  p_ASCIIToHex(argv[1]);
-			(*execAddr)(0, 612, tagAddress);
+			execAddr = (void (*)(unsigned, unsigned))
+			    p_ASCIIToHex(argv[1]);
+			(*execAddr)(0, 612);
 		}
 		break;
 	}
@@ -267,26 +258,6 @@
 			SetServerIPAddress(BuildIP());
 		break;
 
-	case COMMAND_HELP:
-		// dump command info
-		printf("Commands:\r\n"
-		    "\td\r\n"
-		    "\te\r\n"
-		    "\tip\r\n"
-		    "\tserver_ip\r\n"
-		    "\tm\r\n"
-		    "\ttftp\r\n"
-		    "\ts\r\n"
-#ifdef SUPPORT_TAG_LIST
-		    "\tt\r\n"
-#endif
-		    "\tw\r\n"
-		    "\tx\r\n"
-		    "\tI\r\n"
-		    "\tR\r\n"
-		    "\tF\r\n");
-		break;
-
 	case COMMAND_LOCAL_IP:
 		// "local_ip <local IP 192 200 1 21>
 		// set ip of this module
@@ -327,18 +298,6 @@
 		break;
 	}
 
-#ifdef SUPPORT_TAG_LIST
-	case COMMAND_TAG:
-		// t <address> <boot command line>
-		// create tag-list for linux boot
-		if (argc > 2) {
-			RestoreSpace(2);
-			tagAddress = p_ASCIIToHex(argv[1]);
-			InitTagList(argv[2], (void*)tagAddress);
-		}
-		break;
-#endif
-
 	case COMMAND_WRITE:
 		// write the command table to non-volatile
 		WriteCommandTable();