From 8d38d3e0c222bf9f5a1e75ea86bdc608f05e2a70 Mon Sep 17 00:00:00 2001 From: florian Date: Wed, 30 May 2007 10:32:32 +0000 Subject: 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 --- .../adm5120-2.6/patches/140-cmdline_hack.patch | 23 ---------------------- 1 file changed, 23 deletions(-) (limited to 'target/linux/adm5120-2.6/patches/140-cmdline_hack.patch') 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 d72073dfb..3e84056e5 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(); - } -- cgit v1.2.3