X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/8d38d3e0c222bf9f5a1e75ea86bdc608f05e2a70..8b2c7d0c931af2ea427f3a22d2b7b373f8d6cd1a:/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c

diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c b/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c
index 1cbbbc2de..c2e1dcbae 100644
--- a/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c
+++ b/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c
@@ -32,13 +32,12 @@
 
 #include <asm/mach-adm5120/adm5120_info.h>
 
+static char **prom_envp = NULL;
+
 void setup_prom_printf(int);
 void prom_printf(char *, ...);
 void prom_meminit(void);
 
-#define ADM5120_ENVC           1
-
-char *adm5120_envp[2*ADM5120_ENVC] = {"memsize","0x001000000"};
 
 #define READCSR(r)      *(volatile unsigned long *)(0xB2600000+(r))
 #define WRITECSR(r,v)   *(volatile unsigned long *)(0xB2600000+(r)) = v
@@ -81,25 +80,24 @@ void prom_printf(char *fmt, ...)
 
 char *prom_getenv(char *envname)
 {
-	int i, index=0;
+	char **env;
+	char *ret;
 
-	i = strlen(envname);
+	ret = NULL;
 
-	printk(KERN_INFO "GETENV: envname is %s\n", envname);
+	if (prom_envp== NULL)
+		return NULL;
 
-	while(index < (2*ADM5120_ENVC)) {
-		if(strncmp(envname, adm5120_envp[index], i) == 0) {
-			printk(KERN_INFO "GETENV: returning %s\n", adm5120_envp[index+1]);
-			return(adm5120_envp[index+1]);
+	for (env = prom_envp; *env != NULL; env++) {
+		if (strcmp(envname, *env++) == 0) {
+			ret = *env;
+			break;
 		}
-		index += 2;
 	}
 
-	printk(KERN_INFO "GETENV: not found.\n");
-	return(NULL);
+	return ret;
 }
 
-
 extern char _image_cmdline;
 /*
  * initialize the prom module.
@@ -108,6 +106,10 @@ void __init prom_init(void)
 {
 	char *cmd;
 
+	if ((fw_arg2 & 3) == 0) {
+		prom_envp = (char **)fw_arg2;
+	}
+
 	adm5120_info_init();
 
 	/* you should these macros defined in include/asm/bootinfo.h */