| From 61fb4bfc010b0d2940f7fd87acbce6a0f03217cb Mon Sep 17 00:00:00 2001 |
| From: Vineet Gupta <vgupta@synopsys.com> |
| Date: Sat, 5 Apr 2014 15:30:22 +0530 |
| Subject: ARC: [nsimosci] Unbork console |
| |
| From: Vineet Gupta <vgupta@synopsys.com> |
| |
| commit 61fb4bfc010b0d2940f7fd87acbce6a0f03217cb upstream. |
| |
| Despite the switch to right UART driver (prev patch), serial console |
| still doesn't work due to missing CONFIG_SERIAL_OF_PLATFORM |
| |
| Also fix the default cmdline in DT to not refer to out-of-tree |
| ARC framebuffer driver for console. |
| |
| Signed-off-by: Vineet Gupta <vgupta@synopsys.com> |
| Cc: Francois Bedard <Francois.Bedard@synopsys.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arc/boot/dts/nsimosci.dts | 5 ++++- |
| arch/arc/configs/nsimosci_defconfig | 1 + |
| 2 files changed, 5 insertions(+), 1 deletion(-) |
| |
| --- a/arch/arc/boot/dts/nsimosci.dts |
| +++ b/arch/arc/boot/dts/nsimosci.dts |
| @@ -17,7 +17,10 @@ |
| interrupt-parent = <&intc>; |
| |
| chosen { |
| - bootargs = "console=tty0 consoleblank=0"; |
| + /* this is for console on PGU */ |
| + /* bootargs = "console=tty0 consoleblank=0"; */ |
| + /* this is for console on serial */ |
| + bootargs = "earlycon=uart8250,mmio32,0xc0000000,115200n8 console=ttyS0,115200n8 consoleblank=0 debug"; |
| }; |
| |
| aliases { |
| --- a/arch/arc/configs/nsimosci_defconfig |
| +++ b/arch/arc/configs/nsimosci_defconfig |
| @@ -54,6 +54,7 @@ CONFIG_SERIO_ARC_PS2=y |
| CONFIG_SERIAL_8250=y |
| CONFIG_SERIAL_8250_CONSOLE=y |
| CONFIG_SERIAL_8250_DW=y |
| +CONFIG_SERIAL_OF_PLATFORM=y |
| CONFIG_SERIAL_ARC=y |
| CONFIG_SERIAL_ARC_CONSOLE=y |
| # CONFIG_HW_RANDOM is not set |
