aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeon/patches-4.4/160-cmdline-hack.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-05-04 12:57:47 +0200
committerFelix Fietkau <nbd@nbd.name>2017-05-25 19:01:07 +0200
commit30bf133699fc8f93738ddb6c79a5c4edc645e479 (patch)
tree44b1161bf67449772778a273cff82ea26c694474 /target/linux/octeon/patches-4.4/160-cmdline-hack.patch
parent36ba6237d6e3a23fbeadcc1812a892faa4b07cbe (diff)
downloadupstream-30bf133699fc8f93738ddb6c79a5c4edc645e479.tar.gz
upstream-30bf133699fc8f93738ddb6c79a5c4edc645e479.tar.bz2
upstream-30bf133699fc8f93738ddb6c79a5c4edc645e479.zip
octeon: remove linux 4.4 support
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/octeon/patches-4.4/160-cmdline-hack.patch')
-rw-r--r--target/linux/octeon/patches-4.4/160-cmdline-hack.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/target/linux/octeon/patches-4.4/160-cmdline-hack.patch b/target/linux/octeon/patches-4.4/160-cmdline-hack.patch
deleted file mode 100644
index 6e042ef714..0000000000
--- a/target/linux/octeon/patches-4.4/160-cmdline-hack.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/arch/mips/cavium-octeon/setup.c
-+++ b/arch/mips/cavium-octeon/setup.c
-@@ -611,6 +611,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
- */
-@@ -842,6 +871,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");