aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeon/patches-3.18/160-cmdline-hack.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-11-15 21:33:33 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-11-15 21:33:33 +0000
commitacd0e4b8dd25c20d8e99e7a40c90799977c62f55 (patch)
tree3ece3a21bda6a42838a3fc63416c432d9e2e3058 /target/linux/octeon/patches-3.18/160-cmdline-hack.patch
parent3cb722b875b1002f96245f8a24b7e106339fa64f (diff)
downloadupstream-acd0e4b8dd25c20d8e99e7a40c90799977c62f55.tar.gz
upstream-acd0e4b8dd25c20d8e99e7a40c90799977c62f55.tar.bz2
upstream-acd0e4b8dd25c20d8e99e7a40c90799977c62f55.zip
octeon: remove 3.18 support
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> SVN-Revision: 47474
Diffstat (limited to 'target/linux/octeon/patches-3.18/160-cmdline-hack.patch')
-rw-r--r--target/linux/octeon/patches-3.18/160-cmdline-hack.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/target/linux/octeon/patches-3.18/160-cmdline-hack.patch b/target/linux/octeon/patches-3.18/160-cmdline-hack.patch
deleted file mode 100644
index 8ef73a12b2..0000000000
--- a/target/linux/octeon/patches-3.18/160-cmdline-hack.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/arch/mips/cavium-octeon/setup.c
-+++ b/arch/mips/cavium-octeon/setup.c
-@@ -609,6 +609,35 @@ void octeon_user_io_init(void)
- write_c0_derraddr1(0);
- }
-
-+#ifdef CONFIG_IMAGE_CMDLINE_HACK
-+extern char __image_cmdline[];
-+
-+static int __init octeon_use_image_cmdline(void)
-+{
-+ char *p = __image_cmdline;
-+ int replace = 0;
-+
-+ if (*p == '-') {
-+ replace = 1;
-+ p++;
-+ }
-+
-+ if (*p == '\0')
-+ return 0;
-+
-+ if (replace) {
-+ strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline));
-+ } else {
-+ strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
-+ strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
-+ }
-+
-+ return 1;
-+}
-+#else
-+static inline int octeon_use_image_cmdline(void) { return 0; }
-+#endif
-+
- /**
- * Early entry point for arch setup
- */
-@@ -798,6 +827,8 @@ void __init prom_init(void)
- }
- }
-
-+ octeon_use_image_cmdline();
-+
- if (strstr(arcs_cmdline, "console=") == NULL) {
- #ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL
- strcat(arcs_cmdline, " console=ttyS0,115200");