aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120-2.6/files/arch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-05-30 10:32:32 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-05-30 10:32:32 +0000
commita11cd71c3d06de3cf50c6a18f6a6ed0d87f5b238 (patch)
tree94a80ce8dfa44634ff98e21efe448d279c3793d9 /target/linux/adm5120-2.6/files/arch
parent1822d0b004b541318053ecc4a3eb437b69442590 (diff)
downloadupstream-a11cd71c3d06de3cf50c6a18f6a6ed0d87f5b238.tar.gz
upstream-a11cd71c3d06de3cf50c6a18f6a6ed0d87f5b238.tar.bz2
upstream-a11cd71c3d06de3cf50c6a18f6a6ed0d87f5b238.zip
Use the cmdline hacked's prom.c and disable this patching part accordingly
SVN-Revision: 7396
Diffstat (limited to 'target/linux/adm5120-2.6/files/arch')
-rw-r--r--target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c7
1 files changed, 6 insertions, 1 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 63e5b8602c..1cbbbc2de5 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
@@ -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();