diff options
| author | Florian Fainelli <florian@openwrt.org> | 2007-05-30 10:32:32 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2007-05-30 10:32:32 +0000 |
| commit | c96a2a6afa03824b4118b1727e4336133d437090 (patch) | |
| tree | e8a67a279dd557889c16efa35d3fe95c1c1238b3 /target | |
| parent | 87ac4efa3783c1391bb7e4fad0689dddff5f2a5a (diff) | |
| download | upstream-c96a2a6afa03824b4118b1727e4336133d437090.tar.gz upstream-c96a2a6afa03824b4118b1727e4336133d437090.tar.bz2 upstream-c96a2a6afa03824b4118b1727e4336133d437090.zip | |
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')
| -rw-r--r-- | target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c | 7 | ||||
| -rw-r--r-- | target/linux/adm5120-2.6/patches/140-cmdline_hack.patch | 23 |
2 files changed, 6 insertions, 24 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(); diff --git a/target/linux/adm5120-2.6/patches/140-cmdline_hack.patch b/target/linux/adm5120-2.6/patches/140-cmdline_hack.patch index d72073dfbb..3e84056e58 100644 --- a/target/linux/adm5120-2.6/patches/140-cmdline_hack.patch +++ b/target/linux/adm5120-2.6/patches/140-cmdline_hack.patch @@ -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(); - } |