aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeon/patches-4.9/160-cmdline-hack.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-05-03 23:43:01 +0200
committerFelix Fietkau <nbd@nbd.name>2017-05-04 00:40:15 +0200
commit611731a690789c5e7d221c416cb89a7cc327b2fe (patch)
treeb87bab2822613354105907d2916b48b921e3bc48 /target/linux/octeon/patches-4.9/160-cmdline-hack.patch
parent6138d8424337cd60a7b5446e7470072517235e89 (diff)
downloadupstream-611731a690789c5e7d221c416cb89a7cc327b2fe.tar.gz
upstream-611731a690789c5e7d221c416cb89a7cc327b2fe.tar.bz2
upstream-611731a690789c5e7d221c416cb89a7cc327b2fe.zip
octeon: port missing 4.9 patches
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/octeon/patches-4.9/160-cmdline-hack.patch')
-rw-r--r--target/linux/octeon/patches-4.9/160-cmdline-hack.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/target/linux/octeon/patches-4.9/160-cmdline-hack.patch b/target/linux/octeon/patches-4.9/160-cmdline-hack.patch
new file mode 100644
index 0000000000..2a4ad1dc73
--- /dev/null
+++ b/target/linux/octeon/patches-4.9/160-cmdline-hack.patch
@@ -0,0 +1,47 @@
+--- a/arch/mips/cavium-octeon/setup.c
++++ b/arch/mips/cavium-octeon/setup.c
+@@ -656,6 +656,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
+ */
+@@ -900,6 +929,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");