aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeon/patches-3.18
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-03-20 08:49:08 +0000
committerJohn Crispin <john@openwrt.org>2015-03-20 08:49:08 +0000
commit1773aa5163cc3039ae29f3261d84f98c14836937 (patch)
tree5af97a4427c38d1edba198b899444c10dbeea478 /target/linux/octeon/patches-3.18
parente9b6602a84aa329baf0a8cf67e29b19d0afc2c94 (diff)
downloadupstream-1773aa5163cc3039ae29f3261d84f98c14836937.tar.gz
upstream-1773aa5163cc3039ae29f3261d84f98c14836937.tar.bz2
upstream-1773aa5163cc3039ae29f3261d84f98c14836937.zip
octeon: add er8 sysupgrade support
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 44902
Diffstat (limited to 'target/linux/octeon/patches-3.18')
-rw-r--r--target/linux/octeon/patches-3.18/160-cmdline-hack.patch47
1 files changed, 47 insertions, 0 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
new file mode 100644
index 0000000000..39b8a99ae5
--- /dev/null
+++ b/target/linux/octeon/patches-3.18/160-cmdline-hack.patch
@@ -0,0 +1,47 @@
+--- a/arch/mips/cavium-octeon/setup.c
++++ b/arch/mips/cavium-octeon/setup.c
+@@ -609,6 +609,35 @@
+ 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 @@
+ }
+ }
+
++ octeon_use_image_cmdline();
++
+ if (strstr(arcs_cmdline, "console=") == NULL) {
+ #ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL
+ strcat(arcs_cmdline, " console=ttyS0,115200");