[PATCH] ARM: dts: aspeed: Set earlycon boot argument
Alexander A. Filippov
a.filippov at yadro.com
Thu May 27 18:24:57 AEST 2021
On Wed, May 26, 2021 at 02:42:20PM +0930, Joel Stanley wrote:
>
> Most of the aspeed boards have copied the 'earlyprink' string in
> the bootargs. However, there's no earlyprink driver configured in the
> defconfigs, so this does nothing.
>
> A combination of setting stdout in the chosen node and adding earlycon
> to bootargs causes early serial output to appear early. This changes all
> boards to use this option.
>
> The console=ttyS4,115200 option is still required, as this is used by
> the run time uart driver.
>
> Signed-off-by: Joel Stanley <joel at jms.id.au>
Acked-by: Alexander Filippov <a.filippov at yadro>
> ---
> arch/arm/boot/dts/aspeed-ast2500-evb.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-opp-mowgli.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-opp-swift.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 2 +-
> arch/arm/boot/dts/aspeed-bmc-supermicro-x11spi.dts | 2 +-
> 29 files changed, 29 insertions(+), 29 deletions(-)
>
> diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
> index 8bec21ed0de5..583a241f1151 100644
> --- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts
> +++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
> @@ -13,7 +13,7 @@ aliases {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=tty0 console=ttyS4,115200 earlyprintk";
> + bootargs = "console=tty0 console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts b/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts
> index 6aeb47c44eba..79d17841b3d7 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts
> @@ -34,7 +34,7 @@ aliases {
> };
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
> leds {
> compatible = "gpio-leds";
> diff --git a/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
> index 8f5ec22e51c2..bbf8d548397b 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-ampere-mtjade.dts
> @@ -9,7 +9,7 @@ / {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
> index c2ece0b91885..3395de96ee11 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-arm-centriq2400-rep.dts
> @@ -10,7 +10,7 @@ / {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts b/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts
> index 2c29ac037d32..7c6af7f226e7 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts
> @@ -10,7 +10,7 @@ / {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts b/arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts
> index dcab6e78dfa4..33e413ca07e4 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts
> @@ -15,7 +15,7 @@ aliases {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=tty0 console=ttyS4,115200 earlyprintk";
> + bootargs = "console=tty0 console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts b/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts
> index 5ef88c377358..01dace8f5e5f 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-bytedance-g220a.dts
> @@ -55,7 +55,7 @@ aliases {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts
> index 2fb8b147f489..90a3f485c67a 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts
> @@ -280,7 +280,7 @@ aliases {
>
> chosen {
> stdout-path = &uart1;
> - bootargs = "console=ttyS1,9600n8 root=/dev/ram rw earlyprintk";
> + bootargs = "console=ttyS1,9600n8 root=/dev/ram rw earlycon";
> };
>
> ast-adc-hwmon {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts b/arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts
> index 7b4b2b126ad8..b6b16356f571 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts
> @@ -37,7 +37,7 @@ aliases {
> };
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
> index 07593897fc9a..1752f3250e44 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
> @@ -10,7 +10,7 @@ / {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts b/arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts
> index 80c92e065a10..5a98a19f445e 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts
> @@ -11,7 +11,7 @@ / {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "earlyprintk";
> + bootargs = "earlycon";
> };
>
> memory {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts b/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
> index 6e9baf3bba53..d5b7d28cda88 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts
> @@ -10,7 +10,7 @@ / {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "earlyprintk";
> + bootargs = "earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts b/arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts
> index c29e5f4d86ad..8f543cca7c21 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-lenovo-hr630.dts
> @@ -27,7 +27,7 @@ aliases {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=tty0 console=ttyS4,115200 earlyprintk";
> + bootargs = "console=tty0 console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts b/arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts
> index 084c455ad4cb..bcc1820f5c07 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-lenovo-hr855xg2.dts
> @@ -27,7 +27,7 @@ aliases {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=tty0 console=ttyS4,115200 earlyprintk";
> + bootargs = "console=tty0 console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts b/arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts
> index 73319917cb74..3ef8358ff764 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-microsoft-olympus.dts
> @@ -11,7 +11,7 @@ / {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 40000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
> index 42b37a204241..c0847636f20b 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts
> @@ -11,7 +11,7 @@ / {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts b/arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts
> index 15c1f0ac81dc..a52a289cee85 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts
> @@ -57,7 +57,7 @@ aliases {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-mowgli.dts b/arch/arm/boot/dts/aspeed-bmc-opp-mowgli.dts
> index 8503152faaf0..7d38d121ec6d 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-mowgli.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-mowgli.dts
> @@ -11,7 +11,7 @@ / {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts b/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts
> index 91dced7e7849..3d4bdad27c2d 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts
> @@ -10,7 +10,7 @@ / {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> index eb4e93a57ff4..cd660c1ff3f5 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> @@ -10,7 +10,7 @@ / {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 40000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
> index fd2e014dae75..084f54866f38 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
> @@ -9,7 +9,7 @@ / {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts b/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
> index d56b5ed09b37..4816486c0c9e 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
> @@ -10,7 +10,7 @@ / {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts
> index c1478d2db602..e863ec088970 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts
> @@ -13,7 +13,7 @@ / {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200n8";
> + bootargs = "console=ttyS4,115200n8 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts b/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts
> index 01074b6e3e03..328ef472c479 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts
> @@ -11,7 +11,7 @@ / {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 40000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> index 85d58a63ae90..230f3584bcab 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
> @@ -10,7 +10,7 @@ / {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> index 4bcc82046362..7ae4ea0d2931 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
> @@ -17,7 +17,7 @@ aliases {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts b/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts
> index 03c161493ffc..61bc74b423cf 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts
> @@ -14,7 +14,7 @@ aliases {
> };
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 80000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
> index a68ff0675c28..9605e53f5bbf 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts
> @@ -28,7 +28,7 @@ aliases {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "console=ttyS4,115200 earlyprintk";
> + bootargs = "console=ttyS4,115200 earlycon";
> };
>
> memory at 40000000 {
> diff --git a/arch/arm/boot/dts/aspeed-bmc-supermicro-x11spi.dts b/arch/arm/boot/dts/aspeed-bmc-supermicro-x11spi.dts
> index bc16ad2b5c80..50f3c6a5c0c8 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-supermicro-x11spi.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-supermicro-x11spi.dts
> @@ -11,7 +11,7 @@ / {
>
> chosen {
> stdout-path = &uart5;
> - bootargs = "earlyprintk";
> + bootargs = "earlycon";
> };
>
> memory at 80000000 {
> --
> 2.30.2
>
More information about the Linux-aspeed
mailing list