summaryrefslogtreecommitdiff
path: root/arch/arc/boot
diff options
context:
space:
mode:
authorVineet Gupta <vgupta@synopsys.com>2014-03-31 14:52:09 +0400
committerVineet Gupta <vgupta@synopsys.com>2014-06-03 12:50:09 +0400
commite87a850b9c92be6a8cf5735c516ec864d65f24dd (patch)
tree5121fa121b6bd6ce2d6dbed6eee0ac5c213d7fa0 /arch/arc/boot
parentc00bfd974fb0b7a5a501aebada2a94945e38a9a5 (diff)
downloadlinux-e87a850b9c92be6a8cf5735c516ec864d65f24dd.tar.xz
ARC: [arcfpga] Early ARC UART to be only activated by cmdline
Earlier CONFIG_SERIAL_ARC_CONSOLE would unconditionally enable the legacy ARC UART based early console even if platform lacked that UART (e.g. nSIM OSCI platform). So a multi-platform image containing the 2 UART drivers won't work. Fix that by probing the driver only if "earlyprintk=ttyARC0" is present in cmdline. Reported-by: Chuck Jordan <cjordan@synopsys.com> Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Diffstat (limited to 'arch/arc/boot')
-rw-r--r--arch/arc/boot/dts/angel4.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/boot/dts/angel4.dts b/arch/arc/boot/dts/angel4.dts
index bcf662d21a57..5bb2fdaca02f 100644
--- a/arch/arc/boot/dts/angel4.dts
+++ b/arch/arc/boot/dts/angel4.dts
@@ -17,7 +17,7 @@
interrupt-parent = <&intc>;
chosen {
- bootargs = "console=ttyARC0,115200n8";
+ bootargs = "console=ttyARC0,115200n8 earlyprintk=ttyARC0";
};
aliases {