From: Pegorer Massimo <Massimo.Pegorer@vimar.com>
Date: Sat, 15 Jul 2023 10:19:34 +0000 (+0000)
Subject: rockchip: rk3308: no DEBUG_UART_BOARD_INIT for ROCK Pi S
X-Git-Tag: v2025.01-rc5-pxa1908~909^2~43
X-Git-Url: http://git.dujemihanovic.xyz/%22bddb.css/static/gitweb.css?a=commitdiff_plain;h=9f2c7349e516a082b13ded4ae0efd3ce448c8970;p=u-boot.git

rockchip: rk3308: no DEBUG_UART_BOARD_INIT for ROCK Pi S

Call to board_debug_uart_init() is useless, as mainline U-Boot can
not build TPL for rk3308, and proprietary ddr.bin to be used as TPL
is responsible to init debug uart. Moreover current implementation
of board_debug_uart_init() is not compatible with ROCK Pi S, as it
sets pins for UART2 channel 1 breaking access to sdmmc due to pinmux
conflict. Debug uart for ROCK Pi S is UART0.

Thus, avoid ROCKCHIP_RK3308 to select DEBUG_UART_BOARD_INIT and allow
to deselct it in rock-pi-s-rk3308_defconfig. The DEBUG_UART_BOARD_INIT
is already implied by ARCH_ROCKCHIP, therefore other boards based on
rk3308 chip are not affected by change.

Signed-off-by: Massimo Pegorer <massimo.pegorer@vimar.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
---

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 07b5595dac..49da93d54b 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -153,7 +153,6 @@ config ROCKCHIP_RK3288
 config ROCKCHIP_RK3308
 	bool "Support Rockchip RK3308"
 	select ARM64
-	select DEBUG_UART_BOARD_INIT
 	select SUPPORT_SPL
 	select SUPPORT_TPL
 	select SPL
diff --git a/configs/rock-pi-s-rk3308_defconfig b/configs/rock-pi-s-rk3308_defconfig
index c6fae07913..d306b58b8e 100644
--- a/configs/rock-pi-s-rk3308_defconfig
+++ b/configs/rock-pi-s-rk3308_defconfig
@@ -18,6 +18,7 @@ CONFIG_SPL_STACK_R_ADDR=0xc00000
 CONFIG_SPL_STACK=0x400000
 CONFIG_DEBUG_UART_BASE=0xFF0A0000
 CONFIG_DEBUG_UART_CLOCK=24000000
+# CONFIG_DEBUG_UART_BOARD_INIT is not set
 CONFIG_SYS_LOAD_ADDR=0xc00800
 CONFIG_DEBUG_UART=y
 CONFIG_ANDROID_BOOT_IMAGE=y