aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches/203-owrt-cmdline.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2011-11-03 15:15:52 +0000
committerJohn Crispin <blogic@openwrt.org>2011-11-03 15:15:52 +0000
commitfc4b9802d7d9bd293e71057831d02fc0169fc9d3 (patch)
treeb174b3a3d03c0c2b4a9b9c980efe38089069a2d4 /target/linux/lantiq/patches/203-owrt-cmdline.patch
parente4f42228c62c1ef8f075b6765f090af0983feb89 (diff)
downloadmaster-187ad058-fc4b9802d7d9bd293e71057831d02fc0169fc9d3.tar.gz
master-187ad058-fc4b9802d7d9bd293e71057831d02fc0169fc9d3.tar.bz2
master-187ad058-fc4b9802d7d9bd293e71057831d02fc0169fc9d3.zip
lantiq: bump to 3.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28721 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches/203-owrt-cmdline.patch')
-rw-r--r--target/linux/lantiq/patches/203-owrt-cmdline.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches/203-owrt-cmdline.patch b/target/linux/lantiq/patches/203-owrt-cmdline.patch
new file mode 100644
index 0000000000..cd7c95a9c7
--- /dev/null
+++ b/target/linux/lantiq/patches/203-owrt-cmdline.patch
@@ -0,0 +1,45 @@
+--- a/arch/mips/lantiq/prom.c
++++ b/arch/mips/lantiq/prom.c
+@@ -43,6 +43,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;
+@@ -59,6 +87,7 @@ static void __init prom_init_cmdline(voi
+ strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
+ }
+ }
++ prom_init_image_cmdline();
+ }
+
+ void __iomem *ltq_remap_resource(struct resource *res)