qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-29 14:55:29 +02:00
Code

jz4740: Remove dead code from prom code.

Browse Source
This commit is contained in:
Lars-Peter Clausen 2009-12-18 14:59:03 +01:00
parent b4bafa106e
commit 900088580a
1 changed files with 17 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
target/linux/xburst/files-2.6.31/arch/mips/jz4740/prom.c
View File

@ -54,110 +54,26 @@ char * prom_getcmdline(void)
void prom_init_cmdline(void) void prom_init_cmdline(void)
{ {
char *cp; char *cp, *c;
int actr; size_t i = 1;
actr = 1; /* Always ignore argv[0] */
cp = &(arcs_cmdline[0]); cp = &(arcs_cmdline[0]);
while(actr < prom_argc) { while(i < prom_argc) {
strcpy(cp, prom_argv[actr]); c = prom_argv[i];
cp += strlen(prom_argv[actr]); while (*c) {
*cp++ = *c++;
}
*cp++ = ' '; *cp++ = ' ';
actr++; i++;
} }
if (cp != &(arcs_cmdline[0])) /* get rid of trailing space */ if (i > 1) {
--cp; *(cp - 1) = '\0';
if (prom_argc > 1)
*cp = '\0';
} }
char *prom_getenv(char *envname)
{
#if 0
/*
* Return a pointer to the given environment variable.
* YAMON uses "name", "value" pairs, while U-Boot uses "name=value".
*/
char **env = prom_envp;
int i = strlen(envname);
int yamon = (*env && strchr(*env, '=') == NULL);
while (*env) {
if (yamon) {
if (strcmp(envname, *env++) == 0)
return *env;
} else {
if (strncmp(envname, *env, i) == 0 && (*env)[i] == '=')
return *env + i + 1;
}
env++;
}
#endif
return NULL;
}
inline unsigned char str2hexnum(unsigned char c)
{
if(c >= '0' && c <= '9')
return c - '0';
if(c >= 'a' && c <= 'f')
return c - 'a' + 10;
if(c >= 'A' && c <= 'F')
return c - 'A' + 10;
return 0; /* foo */
}
inline void str2eaddr(unsigned char *ea, unsigned char *str)
{
int i;
for(i = 0; i < 6; i++) {
unsigned char num;
if((*str == '.') || (*str == ':'))
str++;
num = str2hexnum(*str++) << 4;
num |= (str2hexnum(*str++));
ea[i] = num;
}
}
int get_ethernet_addr(char *ethernet_addr)
{
char *ethaddr_str;
ethaddr_str = prom_getenv("ethaddr");
if (!ethaddr_str) {
printk("ethaddr not set in boot prom\n");
return -1;
}
str2eaddr(ethernet_addr, ethaddr_str);
#if 0
{
int i;
printk("get_ethernet_addr: ");
for (i=0; i<5; i++)
printk("%02x:", (unsigned char)*(ethernet_addr+i));
printk("%02x\n", *(ethernet_addr+i));
}
#endif
return 0;
}
void __init prom_free_prom_memory(void)
{
} }
void __init prom_init(void) void __init prom_init(void)
{ {
unsigned char *memsize_str;
unsigned long memsize; unsigned long memsize;
prom_argc = (int) fw_arg0; prom_argc = (int) fw_arg0;
@ -167,15 +83,14 @@ void __init prom_init(void)
mips_machtype = MACH_INGENIC_JZ4740; mips_machtype = MACH_INGENIC_JZ4740;
prom_init_cmdline(); prom_init_cmdline();
memsize_str = prom_getenv("memsize");
if (!memsize_str) {
memsize = 0x04000000; memsize = 0x04000000;
} else {
memsize = simple_strtol(memsize_str, NULL, 0);
}
add_memory_region(0, memsize, BOOT_MEM_RAM); add_memory_region(0, memsize, BOOT_MEM_RAM);
} }
void __init prom_free_prom_memory(void)
{
}
/* used by early printk */ /* used by early printk */
void prom_putchar(char c) void prom_putchar(char c)
{ {
@ -194,5 +109,3 @@ const char *get_system_type(void)
} }
EXPORT_SYMBOL(prom_getcmdline); EXPORT_SYMBOL(prom_getcmdline);
EXPORT_SYMBOL(get_ethernet_addr);
EXPORT_SYMBOL(str2eaddr);