Use the cmdline hacked's prom.c and disable this patching part accordingly

[openwrt/svn-archive/archive.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 63e5b8602c36803c2bead7c18614438de479334f..1cbbbc2de5508bef4a8ed9b524a83db02bffa6c3 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
@@ -100,11 +100,14 @@ char *prom_getenv(char *envname)
 }
 
 
+extern char _image_cmdline;
 /*
  * initialize the prom module.
  */
 void __init prom_init(void)
 {
+       char *cmd;
+
        adm5120_info_init();
 
        /* you should these macros defined in include/asm/bootinfo.h */
@@ -112,7 +115,9 @@ void __init prom_init(void)
        mips_machtype = adm5120_board.mach_type;
 
        /* init command line, register a default kernel command line */
-       strcpy(&(arcs_cmdline[0]), CONFIG_CMDLINE);
+       cmd = &_image_cmdline + 8;
+       if( strlen(cmd) > 0) strcpy( &(arcs_cmdline[0]), cmd);
+               else strcpy(&(arcs_cmdline[0]), CONFIG_CMDLINE);
 
        /* init memory map */
        prom_meminit();