WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

rockchip: rk3576: Fix serial console to use UART0 (ttyS0) #8936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperKali merged 4 commits into from
Nov 15, 2025
+18 −7
Merged

rockchip: rk3576: Fix serial console to use UART0 (ttyS0) #8936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f89134f
boot: rk3576: Change debug console from ttyS2 to ttyS0
SuperKali Nov 15, 2025
b631f6c
rockchip: nanopi-r76s/m5 remove SERIALCON on board configuration
SuperKali Nov 15, 2025
8867e42
rockchip64: Set console based on BOOT_SOC instead of only BRANCH
SuperKali Nov 15, 2025
a193bed
rockchip: nanopi-r76s: Enable UART0 in device tree
SuperKali Nov 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion config/boards/nanopi-m5.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ ASOUND_STATE="asound.state.nanopi-m5"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3576-nanopi-m5.dtb"
BOOT_SCENARIO="spl-blobs"
SERIALCON="ttyS0"
BOOT_SUPPORT_SPI="yes"
BOOT_SPI_RKSPI_LOADER="yes"
IMAGE_PARTITION_TABLE="gpt"
Expand Down
1 change: 0 additions & 1 deletion config/boards/nanopi-r76s.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3576-nanopi-r76s.dtb"
BOOT_SCENARIO="spl-blobs"
SERIALCON="ttyS0"
IMAGE_PARTITION_TABLE="gpt"
BOARD_MAINTAINER="SuperKali"

Expand Down
2 changes: 1 addition & 1 deletion config/bootscripts/boot-rk3576.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ fi
if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi

if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyS2,1500000 ${consoleargs}"; fi
if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyS0,1500000 ${consoleargs}"; fi
if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
if test "${bootlogo}" = "true"; then
setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
Expand Down
17 changes: 13 additions & 4 deletions config/sources/families/include/rockchip64_common.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ family_tweaks_bsp() {

}

# A late hook to default SERIALCON based on BRANCH; BOARD and hooks (earlier than 900) can set it to override this.
# A late hook to default SERIALCON based on BRANCH and SOC; BOARD and hooks (earlier than 900) can set it to override this.
function post_family_config__900_late_default_serial_console_by_branch() {
display_alert "rockchip64_common: defaulting SERIALCON" "initial SERIALCON: '${SERIALCON:-"unset"}'" "debug"

Expand All @@ -426,10 +426,19 @@ function post_family_config__900_late_default_serial_console_by_branch() {
SERIALCON="ttyFIQ0"
;;
*)
display_alert "rockchip64_common: defaulting SERIALCON" "Setting SERIALCON to ttyS2 for BRANCH='${BRANCH}'" "info"
SERIALCON="ttyS2"
# Different Rockchip SoCs use different UART for debug console
case $BOOT_SOC in
rk3576)
display_alert "rockchip64_common: defaulting SERIALCON" "Setting SERIALCON to ttyS0 for SoC='${BOOT_SOC}' BRANCH='${BRANCH}'" "info"
SERIALCON="ttyS0"
;;
*)
display_alert "rockchip64_common: defaulting SERIALCON" "Setting SERIALCON to ttyS2 for SoC='${BOOT_SOC}' BRANCH='${BRANCH}'" "info"
SERIALCON="ttyS2"
;;
esac
;;
esac

display_alert "rockchip64_common: defaulting SERIALCON" "final SERIALCON: '${SERIALCON}' for BRANCH='${BRANCH}'" "debug"
display_alert "rockchip64_common: defaulting SERIALCON" "final SERIALCON: '${SERIALCON}' for BRANCH='${BRANCH}' SOC='${BOOT_SOC}'" "debug"
}
4 changes: 4 additions & 0 deletions patch/kernel/archive/rockchip64-6.18/dt/rk3576-nanopi-r76s.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,10 @@
};

/* UART Configuration */
&uart0 {
status = "okay";
};

&uart5 {
pinctrl-names = "default";
pinctrl-0 = <&uart5m0_xfer &uart5m0_ctsn &uart5m0_rtsn>;
Expand Down