PERFORCE change 97498 for review
Warner Losh
imp at FreeBSD.org
Sat May 20 06:14:57 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=97498
Change 97498 by imp at 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();
More information about the p4-projects
mailing list