diff options
author | Stijn Tintel <stijn@linux-ipv6.be> | 2021-04-18 14:53:41 +0300 |
---|---|---|
committer | Stijn Tintel <stijn@linux-ipv6.be> | 2021-04-18 17:00:30 +0300 |
commit | de6080fa8e638c946e9e4f9d36ae8e124c701fb0 (patch) | |
tree | d6d5d60cb9ca1f23ed8868b722afc88465ad747b /target/linux/octeon/patches-5.10/120-cmdline-hack.patch | |
parent | 75c01ee2b92c6702202f89f900428a7f5c6709ad (diff) | |
download | upstream-de6080fa8e638c946e9e4f9d36ae8e124c701fb0.tar.gz upstream-de6080fa8e638c946e9e4f9d36ae8e124c701fb0.tar.bz2 upstream-de6080fa8e638c946e9e4f9d36ae8e124c701fb0.zip |
octeon: add 5.10 as testing kernel
Remove upstreamed parts from 100-ubnt_edgerouter2_support.patch.
Compile and runtime tested on Ubiquiti EdgeRouter Lite.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/octeon/patches-5.10/120-cmdline-hack.patch')
-rw-r--r-- | target/linux/octeon/patches-5.10/120-cmdline-hack.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/target/linux/octeon/patches-5.10/120-cmdline-hack.patch b/target/linux/octeon/patches-5.10/120-cmdline-hack.patch new file mode 100644 index 0000000000..91b2936d99 --- /dev/null +++ b/target/linux/octeon/patches-5.10/120-cmdline-hack.patch @@ -0,0 +1,47 @@ +--- a/arch/mips/cavium-octeon/setup.c ++++ b/arch/mips/cavium-octeon/setup.c +@@ -654,6 +654,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 + */ +@@ -898,6 +927,8 @@ void __init prom_init(void) + } + } + ++ octeon_use_image_cmdline(); ++ + if (strstr(arcs_cmdline, "console=") == NULL) { + if (octeon_uart == 1) + strcat(arcs_cmdline, " console=ttyS1,115200"); |