aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.0/230-cmdline_hack.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2011-07-06 17:27:17 +0000
committerJohn Crispin <blogic@openwrt.org>2011-07-06 17:27:17 +0000
commit111e5605f9f500e3180a7400083c2fb8d0693b79 (patch)
treeacca62cbd1cedc68c360a8af26d56b7207e82b6e /target/linux/lantiq/patches-3.0/230-cmdline_hack.patch
parent622243009f4057b2ca9b08505e374ffc06cf04b9 (diff)
downloadupstream-111e5605f9f500e3180a7400083c2fb8d0693b79.tar.gz
upstream-111e5605f9f500e3180a7400083c2fb8d0693b79.tar.bz2
upstream-111e5605f9f500e3180a7400083c2fb8d0693b79.zip
[lantiq] get ready for 3.0
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27496 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.0/230-cmdline_hack.patch')
-rw-r--r--target/linux/lantiq/patches-3.0/230-cmdline_hack.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-3.0/230-cmdline_hack.patch b/target/linux/lantiq/patches-3.0/230-cmdline_hack.patch
new file mode 100644
index 0000000000..3b8c581763
--- /dev/null
+++ b/target/linux/lantiq/patches-3.0/230-cmdline_hack.patch
@@ -0,0 +1,45 @@
+--- a/arch/mips/lantiq/prom.c
++++ b/arch/mips/lantiq/prom.c
+@@ -39,6 +39,34 @@ void prom_free_prom_memory(void)
+ {
+ }
+
++#ifdef CONFIG_IMAGE_CMDLINE_HACK
++extern char __image_cmdline[];
++
++static void __init
++prom_init_image_cmdline(void)
++{
++ char *p = __image_cmdline;
++ int replace = 0;
++
++ if (*p == '-') {
++ replace = 1;
++ p++;
++ }
++
++ if (*p == '\0')
++ return;
++
++ if (replace) {
++ strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline));
++ } else {
++ strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
++ strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
++ }
++}
++#else
++static void __init prom_init_image_cmdline(void) { return; }
++#endif
++
+ static void __init prom_init_cmdline(void)
+ {
+ int argc = fw_arg0;
+@@ -53,6 +81,7 @@ static void __init prom_init_cmdline(voi
+ strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
+ }
+ }
++ prom_init_image_cmdline();
+ }
+
+ void __init prom_init(void)