diff options
author | John Crispin <john@openwrt.org> | 2011-05-29 21:19:26 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2011-05-29 21:19:26 +0000 |
commit | 6608f419d1a23762f34482b4628f9159bcb81fc2 (patch) | |
tree | 3f0b966c3d64ee995d89ee1a904c4306eedf846d /target/linux/lantiq/patches-2.6.39/230-cmdline_hack.patch | |
parent | c7cdee0230c999197b017fb4aadd49f5eb7dc0b8 (diff) | |
download | upstream-6608f419d1a23762f34482b4628f9159bcb81fc2.tar.gz upstream-6608f419d1a23762f34482b4628f9159bcb81fc2.tar.bz2 upstream-6608f419d1a23762f34482b4628f9159bcb81fc2.zip |
* backport 2.6.8 patches to .39 / .32.33
* remove lqtapi
* bump tapi/dsl to .39
* migrate to new ltq_ style api
* add amazon_se support
SVN-Revision: 27026
Diffstat (limited to 'target/linux/lantiq/patches-2.6.39/230-cmdline_hack.patch')
-rw-r--r-- | target/linux/lantiq/patches-2.6.39/230-cmdline_hack.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-2.6.39/230-cmdline_hack.patch b/target/linux/lantiq/patches-2.6.39/230-cmdline_hack.patch new file mode 100644 index 0000000000..df232869f3 --- /dev/null +++ b/target/linux/lantiq/patches-2.6.39/230-cmdline_hack.patch @@ -0,0 +1,45 @@ +--- a/arch/mips/lantiq/prom.c ++++ b/arch/mips/lantiq/prom.c +@@ -39,6 +39,34 @@ + { + } + ++#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 @@ + strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline)); + } + } ++ prom_init_image_cmdline(); + } + + void __init prom_init(void) |