diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2007-06-25 11:12:51 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2007-06-25 11:12:51 +0000 |
| commit | 07a2a53de9bc0319635610d475e32c4f54614658 (patch) | |
| tree | 03b97b89749f77099b8c2cda13ff38cf32aaf4db /target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c | |
| parent | 0459ba37f3a58269bcd4c58301b0e11b30ee3dcb (diff) | |
| download | master-187ad058-07a2a53de9bc0319635610d475e32c4f54614658.tar.gz master-187ad058-07a2a53de9bc0319635610d475e32c4f54614658.tar.bz2 master-187ad058-07a2a53de9bc0319635610d475e32c4f54614658.zip | |
[adm5120]: from now on, the kernel parses parameters passed by our lzma-loader
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7730 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c')
| -rw-r--r-- | target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c | 28 |
1 files changed, 14 insertions, 14 deletions
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 1cbbbc2de5..a288b073ca 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; + 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,8 @@ void __init prom_init(void) { char *cmd; + prom_envp = (char **)fw_arg2; + adm5120_info_init(); /* you should these macros defined in include/asm/bootinfo.h */ |