summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/nxp-imx8mm-evk
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2020-08-21 06:18:43 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2020-08-21 07:43:00 +0200
commitec82a0888b6ad370e4e3b1b691105eb37684c9d0 (patch)
tree915bf82d80e83b32e1f7bd341272bab12517ec26 /arch/arm/boards/nxp-imx8mm-evk
parent9ba893e0dadcf6721e80f2516881a8830da1e417 (diff)
downloadbarebox-ec82a0888b6ad370e4e3b1b691105eb37684c9d0.tar.gz
barebox-ec82a0888b6ad370e4e3b1b691105eb37684c9d0.tar.xz
ARM: i.MX8M boards: always set up UART
Quoting Lucas on b96cc34f91 ("ARM: nxp-imx8mm-evk: always set up UART"): | When the TF-A is configured to have some output on the UART it does not | set up the UART on its own, but just expects a pre-existing configuration. | If Barebox did not set up the UART in the !DEBUG_LL case, TF-A will just | hang without any user accessible debug output, which is a very non-obvious | failure, so better be safe and always set up the UART in case TF-A wants | to use it. This patch adopts this for all i.MX8M boards and makes the early UART setup consistent across all of them. We also add pbl_set_putc() to enable regular PBL console messages. For the i.MX8MM-EVK the unnecessary call to imx8m_uart_setup_ll() is dropped; we already configured the UART in imx8m_uart_setup(), no need to do that again. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/nxp-imx8mm-evk')
-rw-r--r--arch/arm/boards/nxp-imx8mm-evk/lowlevel.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c b/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c
index 96b78d2c66..2297dc01e7 100644
--- a/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c
+++ b/arch/arm/boards/nxp-imx8mm-evk/lowlevel.c
@@ -28,16 +28,16 @@ extern char __dtb_imx8mm_evk_start[];
static void setup_uart(void)
{
+ void __iomem *uart = IOMEM(MX8M_UART2_BASE_ADDR);
+
imx8m_early_setup_uart_clock();
imx8mm_setup_pad(IMX8MM_PAD_UART2_TXD_UART2_TX | UART_PAD_CTRL);
+ imx8m_uart_setup(uart);
- imx8m_uart_setup((void *)MX8M_UART2_BASE_ADDR);
+ pbl_set_putc(imx_uart_putc, uart);
- if (IS_ENABLED(CONFIG_DEBUG_LL)) {
- imx8m_uart_setup_ll();
- putc_ll('>');
- }
+ putc_ll('>');
}
static void pmic_reg_write(void *i2c, int reg, uint8_t val)