move openssl to 0.9.8e

[openwrt.git] / 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 ba8051e..e16ac65 100644 (file)
--- a/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c
+++ b/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c
@@ -29,6 +29,8 @@
 #include <asm/bootinfo.h>
 #include <asm/addrspace.h>
 
+#include <adm5120_info.h>
+
 void setup_prom_printf(int);
 void prom_printf(char *, ...);
 void prom_meminit(void);
@@ -95,6 +97,7 @@ char *prom_getenv(char *envname)
        printk(KERN_INFO "GETENV: not found.\n");
        return(NULL);
 }
+
        
 /*
  * initialize the prom module.
@@ -104,9 +107,11 @@ void __init prom_init(void)
        /* you should these macros defined in include/asm/bootinfo.h */
        mips_machgroup = MACH_GROUP_ADM_GW;
        mips_machtype = MACH_ADM_GW_5120;
+       
+       adm5120_info_init();
 
        /* init command line, register a default kernel command line */
-       strcpy(&(arcs_cmdline[0]), "console=ttyS0,115200 rootfstype=jffs2 init=/etc/preinit");
+       strcpy(&(arcs_cmdline[0]), CONFIG_CMDLINE);
 
        /* init memory map */
        prom_meminit();