From f32539b33845777b13f49880aec0e4f7a89049a9 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Tue, 17 May 2022 00:21:45 +0200 Subject: [PATCH] ARM: imx8mm: verdin-imx8mm: fix board hang in spl Move the preloader_console_init() call after spl_early_init() to avoid board hang in SPL. While at it remove explicit in-code console/debug UART pinmuxing (uart1 and its pinmuxing are already marked as u-boot,dm-spl via device tree). Fixes: d5a8ebd91ac8 ("configs: verdin-imx8mm: verdin-imx8mp: enable dm serial") Signed-off-by: Marcel Ziswiler --- board/toradex/verdin-imx8mm/spl.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/board/toradex/verdin-imx8mm/spl.c b/board/toradex/verdin-imx8mm/spl.c index 1f643129d9..037fd273ce 100644 --- a/board/toradex/verdin-imx8mm/spl.c +++ b/board/toradex/verdin-imx8mm/spl.c @@ -74,19 +74,10 @@ int board_fit_config_name_match(const char *name) } #endif -#define UART_PAD_CTRL (PAD_CTL_PUE | PAD_CTL_PE | PAD_CTL_DSE4) - -/* Verdin UART_3, Console/Debug UART */ -static iomux_v3_cfg_t const uart_pads[] = { - IMX8MM_PAD_SAI2_RXFS_UART1_TX | MUX_PAD_CTRL(UART_PAD_CTRL), - IMX8MM_PAD_SAI2_RXC_UART1_RX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; __weak void board_early_init(void) { init_uart_clk(0); - - imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads)); } int power_init_board(void) @@ -132,8 +123,6 @@ void board_init_f(ulong dummy) timer_init(); - preloader_console_init(); - /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); @@ -151,6 +140,8 @@ void board_init_f(ulong dummy) hang(); } + preloader_console_init(); + enable_tzc380(); power_init_board(); -- 2.39.5