cns3xxx: merge gpio patches
[openwrt.git] / target / linux / lantiq / patches-3.3 / 0021-owrt-cmdline.patch
1 From 9189efcc94f8492f403162484c5d2fc35c9f3fd1 Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Fri, 3 Aug 2012 10:27:43 +0200
4 Subject: [PATCH 21/25] owrt cmdline
5
6 ---
7  arch/mips/lantiq/prom.c |   29 +++++++++++++++++++++++++++++
8  1 files changed, 29 insertions(+), 0 deletions(-)
9
10 diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c
11 index 00ad59c..0fdef27 100644
12 --- a/arch/mips/lantiq/prom.c
13 +++ b/arch/mips/lantiq/prom.c
14 @@ -43,6 +43,34 @@ void prom_free_prom_memory(void)
15  {
16  }
17  
18 +#ifdef CONFIG_IMAGE_CMDLINE_HACK
19 +extern char __image_cmdline[];
20 +
21 +static void __init
22 +prom_init_image_cmdline(void)
23 +{
24 +       char *p = __image_cmdline;
25 +       int replace = 0;
26 +
27 +       if (*p == '-') {
28 +               replace = 1;
29 +               p++;
30 +       }
31 +
32 +       if (*p == '\0')
33 +               return;
34 +
35 +       if (replace) {
36 +               strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline));
37 +       } else {
38 +               strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
39 +               strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
40 +       }
41 +}
42 +#else
43 +static void __init prom_init_image_cmdline(void) { return; }
44 +#endif
45 +
46  static void __init prom_init_cmdline(void)
47  {
48         int argc = fw_arg0;
49 @@ -59,6 +87,7 @@ static void __init prom_init_cmdline(void)
50                         strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
51                 }
52         }
53 +       prom_init_image_cmdline();
54  }
55  
56  void __iomem *ltq_remap_resource(struct resource *res)
57 -- 
58 1.7.9.1
59