diff options
author | Felix Fietkau <nbd@nbd.name> | 2018-09-29 18:07:33 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2018-09-29 18:09:45 +0200 |
commit | 6ce13b87eb80739a3b8c8e2aec791f0eb71c563d (patch) | |
tree | 2755993346675bcce4384906db1ee89119350442 /target/linux/octeon/patches-4.9/160-cmdline-hack.patch | |
parent | b7dfc59e63292dce7bfc2d897c1bd47534ef69c2 (diff) | |
download | upstream-6ce13b87eb80739a3b8c8e2aec791f0eb71c563d.tar.gz upstream-6ce13b87eb80739a3b8c8e2aec791f0eb71c563d.tar.bz2 upstream-6ce13b87eb80739a3b8c8e2aec791f0eb71c563d.zip |
octeon: remove linux 4.9 support
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.patch | 47 |
1 files changed, 0 insertions, 47 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 deleted file mode 100644 index 2a4ad1dc73..0000000000 --- a/target/linux/octeon/patches-4.9/160-cmdline-hack.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- 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"); |