From debc0ed417ac10baed07be9e059cdbdb72ab4dca Mon Sep 17 00:00:00 2001 From: Jia Wang Date: Tue, 13 Jan 2026 17:12:42 +0800 Subject: [PATCH 1/2] Revert "riscv: dts: ultrarisc: remove 'bootargs' property in 'chosen'" This reverts commit ded9449d4aa80a92593df3e1180ec5c2f4fb57cb. --- arch/riscv/boot/dts/ultrarisc/dp1000-evb-v1.dts | 3 ++- arch/riscv/boot/dts/ultrarisc/dp1000-m0-v1.dts | 3 ++- arch/riscv/boot/dts/ultrarisc/dp1000-titan-v1.dts | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/riscv/boot/dts/ultrarisc/dp1000-evb-v1.dts b/arch/riscv/boot/dts/ultrarisc/dp1000-evb-v1.dts index f6e17183cc14..5ae8b3bb5719 100644 --- a/arch/riscv/boot/dts/ultrarisc/dp1000-evb-v1.dts +++ b/arch/riscv/boot/dts/ultrarisc/dp1000-evb-v1.dts @@ -12,7 +12,8 @@ compatible = "ultrarisc,evb-v1", "ultrarisc,dp1000"; chosen { - stdout-path = "serial1:115200n8"; + bootargs = "earlycon=sbi console=ttyS1,115200"; + stdout-path = &uart1; }; }; diff --git a/arch/riscv/boot/dts/ultrarisc/dp1000-m0-v1.dts b/arch/riscv/boot/dts/ultrarisc/dp1000-m0-v1.dts index c17d84877679..29b9240418b8 100644 --- a/arch/riscv/boot/dts/ultrarisc/dp1000-m0-v1.dts +++ b/arch/riscv/boot/dts/ultrarisc/dp1000-m0-v1.dts @@ -12,7 +12,8 @@ compatible = "rongda,m0-v1", "ultrarisc,dp1000"; chosen { - stdout-path = "serial0:115200n8"; + bootargs = "earlycon=sbi console=ttyS0,115200"; + stdout-path = &uart0; }; gpio-poweroff { diff --git a/arch/riscv/boot/dts/ultrarisc/dp1000-titan-v1.dts b/arch/riscv/boot/dts/ultrarisc/dp1000-titan-v1.dts index 3b2d04cfb447..f90ba54ee764 100644 --- a/arch/riscv/boot/dts/ultrarisc/dp1000-titan-v1.dts +++ b/arch/riscv/boot/dts/ultrarisc/dp1000-titan-v1.dts @@ -15,7 +15,8 @@ compatible = "milkv,titan-v1.2", "ultrarisc,dp1000"; chosen { - stdout-path = "serial0:115200n8"; + bootargs = "earlycon=sbi console=ttyS0,115200"; + stdout-path = &uart0; }; gpio-poweroff { From 24d0806e7f3cc8612c70a20de0ca40a9db98d699 Mon Sep 17 00:00:00 2001 From: Jia Wang Date: Thu, 8 Jan 2026 09:25:16 +0800 Subject: [PATCH 2/2] riscv: dts: ultrarisc: remove 'bootargs' property in 'chosen' community inclusion category: feature bugzilla: https://github.com/RVCK-Project/rvck/issues/71 -------------------------------- Remove 'bootargs' and only use 'stdout-path'. Signed-off-by: Jia Wang --- arch/riscv/boot/dts/ultrarisc/dp1000-evb-v1.dts | 10 ++++++++-- arch/riscv/boot/dts/ultrarisc/dp1000-m0-v1.dts | 10 ++++++++-- arch/riscv/boot/dts/ultrarisc/dp1000-titan-v1.dts | 10 ++++++++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/arch/riscv/boot/dts/ultrarisc/dp1000-evb-v1.dts b/arch/riscv/boot/dts/ultrarisc/dp1000-evb-v1.dts index 5ae8b3bb5719..3dff7ea6618f 100644 --- a/arch/riscv/boot/dts/ultrarisc/dp1000-evb-v1.dts +++ b/arch/riscv/boot/dts/ultrarisc/dp1000-evb-v1.dts @@ -12,8 +12,14 @@ compatible = "ultrarisc,evb-v1", "ultrarisc,dp1000"; chosen { - bootargs = "earlycon=sbi console=ttyS1,115200"; - stdout-path = &uart1; + stdout-path = "serial1:115200n8"; + }; + + aliases { + serial0 = &uart0; + serial1 = &uart1; + serial2 = &uart2; + serial3 = &uart3; }; }; diff --git a/arch/riscv/boot/dts/ultrarisc/dp1000-m0-v1.dts b/arch/riscv/boot/dts/ultrarisc/dp1000-m0-v1.dts index 29b9240418b8..ccec9d0ddf17 100644 --- a/arch/riscv/boot/dts/ultrarisc/dp1000-m0-v1.dts +++ b/arch/riscv/boot/dts/ultrarisc/dp1000-m0-v1.dts @@ -12,8 +12,14 @@ compatible = "rongda,m0-v1", "ultrarisc,dp1000"; chosen { - bootargs = "earlycon=sbi console=ttyS0,115200"; - stdout-path = &uart0; + stdout-path = "serial0:115200n8"; + }; + + aliases { + serial0 = &uart0; + serial1 = &uart1; + serial2 = &uart2; + serial3 = &uart3; }; gpio-poweroff { diff --git a/arch/riscv/boot/dts/ultrarisc/dp1000-titan-v1.dts b/arch/riscv/boot/dts/ultrarisc/dp1000-titan-v1.dts index f90ba54ee764..e9a614afa0f0 100644 --- a/arch/riscv/boot/dts/ultrarisc/dp1000-titan-v1.dts +++ b/arch/riscv/boot/dts/ultrarisc/dp1000-titan-v1.dts @@ -15,8 +15,14 @@ compatible = "milkv,titan-v1.2", "ultrarisc,dp1000"; chosen { - bootargs = "earlycon=sbi console=ttyS0,115200"; - stdout-path = &uart0; + stdout-path = "serial0:115200n8"; + }; + + aliases { + serial0 = &uart0; + serial1 = &uart1; + serial2 = &uart2; + serial3 = &uart3; }; gpio-poweroff {