diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-01-12 20:52:19 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-01-12 20:52:19 +0000 |
| commit | cdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2 (patch) | |
| tree | aeb91c1e1c35fc3c481922ebb7234903b6c855e8 /target/linux/octeon/patches-4.3/160-cmdline-hack.patch | |
| parent | 93b50ade934436d00e5f68c3feabf030ace8d98d (diff) | |
| download | upstream-cdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2.tar.gz upstream-cdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2.tar.bz2 upstream-cdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2.zip | |
kernel/4.3: update to version 4.3.3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de
SVN-Revision: 48224
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.patch | 14 |
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 fd17796829..6e042ef714 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"); |