diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-03-06 09:30:22 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-03-06 09:30:22 +0300 |
commit | 8af31363cda93724c237b6ffb24380f4441d2f8d (patch) | |
tree | dc25d9ff94761b0adc9381aebd06c8e7f77884e3 /arch/arc/boot/dts/nsimosci.dts | |
parent | ddc4becca1409541c2ebb7ecb99b5cef44cf17e4 (diff) | |
parent | 661e50bc853209e41a5c14a290ca4decc43cbfd1 (diff) | |
download | linux-8af31363cda93724c237b6ffb24380f4441d2f8d.tar.xz |
Merge tag 'v4.16-rc4' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arc/boot/dts/nsimosci.dts')
-rw-r--r-- | arch/arc/boot/dts/nsimosci.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/boot/dts/nsimosci.dts b/arch/arc/boot/dts/nsimosci.dts index 3c391ba565ed..7842e5eb4ab5 100644 --- a/arch/arc/boot/dts/nsimosci.dts +++ b/arch/arc/boot/dts/nsimosci.dts @@ -20,7 +20,7 @@ /* this is for console on PGU */ /* bootargs = "console=tty0 consoleblank=0"; */ /* this is for console on serial */ - bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug video=640x480-24"; + bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug video=640x480-24 print-fatal-signals=1"; }; aliases { |