summaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120-2.6/files/arch/mips/adm5120
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-05-30 10:32:32 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-05-30 10:32:32 +0000
commit8d38d3e0c222bf9f5a1e75ea86bdc608f05e2a70 (patch)
treee8a67a279dd557889c16efa35d3fe95c1c1238b3 /target/linux/adm5120-2.6/files/arch/mips/adm5120
parentdf91d4a199216b13ddf1d7f4794d2370ce641c10 (diff)
Use the cmdline hacked's prom.c and disable this patching part accordingly
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7396 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120-2.6/files/arch/mips/adm5120')
-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 63e5b8602..1cbbbc2de 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();