[PATCH v5 1/6] rockchip: px30: fix possibly unused grf and cru variables

[Kever Yang]

Hi Quentin,

     Seems like this still not fix all the case for board ringneck-px30.

I got below error after I fix the CFG_IRAM_BASE:

    aarch64:  +   ringneck-px30
+/usr/lib/python3/dist-packages/setuptools/dist.py:473: UserWarning: 
Normalizing '2023.01' to '2023.1'
+  warnings.warn(
+In file included from drivers/serial/ns16550.c:13:0:
+include/ns16550.h:43:2: error: #error "Please define NS16550 registers 
size."
+ #error "Please define NS16550 registers size."
+  ^~~~~

Thanks,

- Kever

On 2023/1/3 21:26, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz at theobroma-systems.com>
>
> The grf and cru are only used when no UART base is provided by the user
> (defaults to UART2) or for UART1, UART3 and UART5 to be used for the
> debug UART. Therefore, let's surround those variable definitions with
> the proper checks.
>
> This wasn't an issue before support for UART0 was added, because all
> cases were using cru and grf. UART0 only uses pmucru so there's a need
> to not define those variables anymore.
>
> Fixes: d0af506625ff ("rockchip: px30: support debug uart on UART0")
> Cc: Quentin Schulz <foss+uboot at 0leil.net>
> Signed-off-by: Quentin Schulz <quentin.schulz at theobroma-systems.com>
> ---
>   arch/arm/mach-rockchip/px30/px30.c | 10 ++++++++++
>   1 file changed, 10 insertions(+)
>
> diff --git a/arch/arm/mach-rockchip/px30/px30.c b/arch/arm/mach-rockchip/px30/px30.c
> index 0641e6af0f..35a36700df 100644
> --- a/arch/arm/mach-rockchip/px30/px30.c
> +++ b/arch/arm/mach-rockchip/px30/px30.c
> @@ -297,8 +297,18 @@ void board_debug_uart_init(void)
>   	CONFIG_DEBUG_UART_BASE == 0xff030000)
>   	static struct px30_pmugrf * const pmugrf = (void *)PMUGRF_BASE;
>   #endif
> +#if !defined(CONFIG_DEBUG_UART_BASE) || \
> +	(CONFIG_DEBUG_UART_BASE != 0xff158000 && \
> +	 CONFIG_DEBUG_UART_BASE != 0xff168000 && \
> +	 CONFIG_DEBUG_UART_BASE != 0xff178000 && \
> +	 CONFIG_DEBUG_UART_BASE != 0xff030000) || \
> +	(defined(CONFIG_DEBUG_UART_BASE) && \
> +	 (CONFIG_DEBUG_UART_BASE == 0xff158000 || \
> +	  CONFIG_DEBUG_UART_BASE == 0xff168000 || \
> +	  CONFIG_DEBUG_UART_BASE == 0xff178000))
>   	static struct px30_grf * const grf = (void *)GRF_BASE;
>   	static struct px30_cru * const cru = (void *)CRU_BASE;
> +#endif
>   #if defined(CONFIG_DEBUG_UART_BASE) && CONFIG_DEBUG_UART_BASE == 0xff030000
>   	static struct px30_pmucru * const pmucru = (void *)PMUCRU_BASE;
>   #endif
>