diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-10-21 20:36:27 +0900 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-23 22:10:42 +0200 |
| commit | 06ff6b2d63210922a1b1d0f4997e29ce75b5e0c0 (patch) | |
| tree | 864bbe2d260c9f07fff45c06b41e6d5ed79a4a57 | |
| parent | a3de778b1faecdb4a8709d96ac0ab3a61b40e898 (diff) | |
ARM: dts: uniphier: use stdout-path instead of console
Specifying both console and stdout-path is redundant. Add options
":115200n8" to stdout-path and drop "console=ttyS0,115200".
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts | 3 |
5 files changed, 5 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts b/arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts index e9722a5ea781..f1e9d40149ab 100644 --- a/arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts +++ b/arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts @@ -57,8 +57,7 @@ }; chosen { - bootargs = "console=ttyS0,115200"; - stdout-path = &serial0; + stdout-path = "serial0:115200n8"; }; aliases { diff --git a/arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts b/arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts index 1757c4b2c3db..2e36b26f2762 100644 --- a/arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts +++ b/arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts @@ -57,8 +57,7 @@ }; chosen { - bootargs = "console=ttyS0,115200"; - stdout-path = &serial0; + stdout-path = "serial0:115200n8"; }; aliases { diff --git a/arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts b/arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts index 47e2edb03401..24626687d4df 100644 --- a/arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts +++ b/arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts @@ -57,8 +57,7 @@ }; chosen { - bootargs = "console=ttyS0,115200"; - stdout-path = &serial0; + stdout-path = "serial0:115200n8"; }; aliases { diff --git a/arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts b/arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts index adcbbc6b95d8..b7a032156789 100644 --- a/arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts +++ b/arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts @@ -58,8 +58,7 @@ }; chosen { - bootargs = "console=ttyS0,115200"; - stdout-path = &serial0; + stdout-path = "serial0:115200n8"; }; aliases { diff --git a/arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts b/arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts index bcf2e7cc390f..fc7250c61674 100644 --- a/arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts +++ b/arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts @@ -57,8 +57,7 @@ }; chosen { - bootargs = "console=ttyS0,115200"; - stdout-path = &serial0; + stdout-path = "serial0:115200n8"; }; aliases { |