[U-Boot] [PATCH v2 1/2] rockchip: rk3399: spl: add UART0 support for SPL

[Simon Glass]

Hi,

On 26 March 2017 at 10:30, Dr. Philipp Tomsich
<philipp.tomsich at theobroma-systems.com> wrote:
> Simon,
>
> you’ll need
> CONFIG_DEBUG_UART_BOARD_INIT=y
> as include/debug_uart.h checks this macro and either defines this function
> inline (with
> an empty body) or allows the function definition.
>
> Seems like everyone just adds this to their defconfig (as did we), but I am
> open towards
> an automatic selection of this for ROCKCHIP_RK3399 via Kconfig.

Well we need to do something since I cannot apply patches which break
the build! Please can you make sure your patches apply cleaning to
u-boot mainline or u-boot-rockchip, and that each one independently
builds. It really speeds up the process!

>
> Regards,
> Philipp.
>
> On 26 Mar 2017, at 04:38, Simon Glass <sjg at chromium.org> wrote:
>
> Hi,
>
> On 23 March 2017 at 20:12, Kever Yang <kever.yang at rock-chips.com> wrote:
>
>
> Hi Philipp,
>
>
> On 03/24/2017 06:24 AM, Philipp Tomsich wrote:
>
>
> The RK3399-Q7 ("Puma") SoM exposes UART0 as the Qseven UART (i.e. the
> serial line available via standardised pins on the edge connector and
> available on a RS232 connector).
>
> To support boards (such as the RK3399-Q7) that require UART0 as a
> debug console, we match CONFIG_DEBUG_UART_BASE and add the appropriate
> iomux setup to the rk3399 SPL code.
>
> As we are already touching this code, we also move the board-specific
> UART setup (i.e. iomux setup) into board_debug_uart_init(). This will
> be called from the debug UART init when CONFIG_DEBUG_UART_BOARD_INIT
> is set.
>
> Signed-off-by: Philipp Tomsich <philipp.tomsich at theobroma-systems.com>
> ---
>
> Changes in v2:
> - Changed hex constant to lowercase
>
>  arch/arm/include/asm/arch-rockchip/grf_rk3399.h |  8 +++++++
>  arch/arm/mach-rockchip/rk3399-board-spl.c       | 29
> ++++++++++++++++++-------
>  2 files changed, 29 insertions(+), 8 deletions(-)
>
>
> This patch causes a build error for me:
>
>   aarch64:  +   evb-rk3399
> +arch/arm/mach-rockchip/rk3399-board-spl.c:60:6: error: redefinition
> of 'board_debug_uart_init'
> + void board_debug_uart_init(void)
> +      ^
> +In file included from arch/arm/mach-rockchip/rk3399-board-spl.c:8:0:
> +include/debug_uart.h:68:20: note: previous definition of
> 'board_debug_uart_init' was here
> + static inline void board_debug_uart_init(void)
> +                    ^
> +make[3]: *** [spl/arch/arm/mach-rockchip/rk3399-board-spl.o] Error 1
> +make[2]: *** [spl/arch/arm/mach-rockchip] Error 2
> +make[1]: *** [spl/u-boot-spl] Error 2
> +make: *** [sub-make] Error 2
>

Regards,
Simon