summaryrefslogtreecommitdiff
path: root/target/linux/octeon/patches-4.3/160-cmdline-hack.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/octeon/patches-4.3/160-cmdline-hack.patch')
-rw-r--r--target/linux/octeon/patches-4.3/160-cmdline-hack.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/octeon/patches-4.3/160-cmdline-hack.patch b/target/linux/octeon/patches-4.3/160-cmdline-hack.patch
index fd17796..6e042ef 100644
--- a/target/linux/octeon/patches-4.3/160-cmdline-hack.patch
+++ b/target/linux/octeon/patches-4.3/160-cmdline-hack.patch
@@ -1,9 +1,9 @@
--- 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);
+ write_c0_derraddr1(0);
}
-
+
+#ifdef CONFIG_IMAGE_CMDLINE_HACK
+extern char __image_cmdline[];
+
@@ -37,11 +37,11 @@
* 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) {
+ if (strstr(arcs_cmdline, "console=") == NULL) {
#ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL
- strcat(arcs_cmdline, " console=ttyS0,115200");
+ strcat(arcs_cmdline, " console=ttyS0,115200");