mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 21:09:53 +02:00
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
This commit is contained in:
parent
df91d4a199
commit
8d38d3e0c2
@ -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();
|
||||
|
@ -25,26 +25,3 @@ diff -ur linux.old/arch/mips/kernel/head.S linux.dev/arch/mips/kernel/head.S
|
||||
|
||||
EXPORT(stext) # used for profiling
|
||||
EXPORT(_stext)
|
||||
diff -ur linux.old/arch/mips/adm5120/prom.c linux.dev/arch/mips/adm5120/prom.c
|
||||
--- linux.old/arch/mips/adm5120/prom.c 2006-12-06 17:30:27.000000000 +0100
|
||||
+++ linux.dev/arch/mips/adm5120/prom.c 2006-12-06 17:41:40.000000000 +0100
|
||||
@@ -100,6 +100,7 @@
|
||||
}
|
||||
|
||||
|
||||
+extern char _image_cmdline;
|
||||
/*
|
||||
* initialize the prom module.
|
||||
*/
|
||||
@@ -112,8 +112,10 @@
|
||||
mips_machtype = adm5120_board.mach_type;
|
||||
|
||||
/* init command line, register a default kernel command line */
|
||||
- strcpy(&(arcs_cmdline[0]), CONFIG_CMDLINE);
|
||||
+ char *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();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user