diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-28 02:07:11 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-28 02:10:43 -0400 |
| commit | 22524b02b17b901f28a62229f8c32416c8e8acfe (patch) | |
| tree | 6d7262a9d24f7f5bb1af67751e19463c7cec882d /arch/arc/boot | |
| parent | dc824ebed081ed6227772b3cc5f9c7a6683fb489 (diff) | |
Revert "ARC: [arcfpga] stdout-path now suffices for earlycon/console"
This reverts commit 9da433c0a0b5f71ac92dc9dca778295649675f08.
Vineet writes:
Could you please revert this single patch from tty-next for 3.17 as the
needed core changes are not yet finalized.
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arc/boot')
| -rw-r--r-- | arch/arc/boot/dts/angel4.dts | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arc/boot/dts/angel4.dts b/arch/arc/boot/dts/angel4.dts index 298a46daa633..6b57475967a6 100644 --- a/arch/arc/boot/dts/angel4.dts +++ b/arch/arc/boot/dts/angel4.dts | |||
| @@ -17,8 +17,7 @@ | |||
| 17 | interrupt-parent = <&intc>; | 17 | interrupt-parent = <&intc>; |
| 18 | 18 | ||
| 19 | chosen { | 19 | chosen { |
| 20 | bootargs = "earlycon"; | 20 | bootargs = "earlycon=arc_uart,mmio32,0xc0fc1000,115200n8 console=ttyARC0,115200n8"; |
| 21 | stdout-path = &arcuart0; | ||
| 22 | }; | 21 | }; |
| 23 | 22 | ||
| 24 | aliases { | 23 | aliases { |
