[PATCH 2/4] rockchip: rk3308: no DEBUG_UART_BOARD_INIT for ROCK Pi S

[Kever Yang]

On 2023/7/15 18:19, Pegorer Massimo wrote:
> 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 at vimar.com>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>   arch/arm/mach-rockchip/Kconfig     | 1 -
>   configs/rock-pi-s-rk3308_defconfig | 1 +
>   2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
> index 9d6d20bf8e..3f8c6d3e3c 100644
> --- a/arch/arm/mach-rockchip/Kconfig
> +++ b/arch/arm/mach-rockchip/Kconfig
> @@ -152,7 +152,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