diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2022-09-19 20:49:16 +0200 |
|---|---|---|
| committer | Madhukar Pappireddy <madhukar.pappireddy@arm.com> | 2022-09-20 15:12:00 +0200 |
| commit | 901d74b2d46cbd8b1d27477fa16388520fdabab1 (patch) | |
| tree | 6edab7ddb25a6917c1e808e8b0e7089428460169 /plat/imx/imx8m/imx8mn | |
| parent | 7d3287f3407632f765df3037479281ba6b23b141 (diff) | |
| download | arm-trusted-firmware-901d74b2d46cbd8b1d27477fa16388520fdabab1.tar.gz | |
fix(imx8m): move caam init after serial init
CAAM provides serial output during initialization, but the serial init
occurs after CAAM. This leads to serial output produced by CAAM init
function to be omitted and not displayed.
Change the order of initialization and call CAAM init after Serial. This
has no impact as Serial does not require CAAM to be initialized upfront.
Fixes: 2502709f60de ("plat: imx8m: Add caam module init on imx8m")
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Cc: Jacky Bai <ping.bai@nxp.com>
Change-Id: I09c0a5474a1babfb0b53c4455891689ec08b5bdb
Diffstat (limited to 'plat/imx/imx8m/imx8mn')
| -rw-r--r-- | plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c index 5d2a64e8a..464c87dde 100644 --- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c +++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c @@ -139,13 +139,13 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, val = mmio_read_32(IMX_IOMUX_GPR_BASE + 0x2c); mmio_write_32(IMX_IOMUX_GPR_BASE + 0x2c, val | 0x3DFF0000); - imx8m_caam_init(); - console_imx_uart_register(IMX_BOOT_UART_BASE, IMX_BOOT_UART_CLK_IN_HZ, IMX_CONSOLE_BAUDRATE, &console); /* This console is only used for boot stage */ console_set_scope(&console, CONSOLE_FLAG_BOOT); + imx8m_caam_init(); + /* * tell BL3-1 where the non-secure software image is located * and the entry state information. |