From: Lucas Stach Date: Thu, 8 Dec 2022 15:00:04 +0000 (+0100) Subject: feat(imx8mq): always set up console X-Git-Tag: baikal/aarch64/sdk5.10~1^2~307^2~3 X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=36be10861e851e7e4df06bb08aab60d8e878d2b2;p=arm-tf.git feat(imx8mq): always set up console This aligns the i.MX8MQ platform behaviour with the other i.MX8M* platforms by always setting up the console UART. Signed-off-by: Lucas Stach Change-Id: I1279d9cb4feb6e789422b9844cab711b8daae74e --- diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c index 0feb6d7fb..0972c35e9 100644 --- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c +++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c @@ -124,6 +124,7 @@ static void bl31_tz380_setup(void) void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, u_register_t arg2, u_register_t arg3) { + static console_t console; int i; /* enable CSU NS access permission */ for (i = 0; i < 64; i++) { @@ -132,12 +133,10 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, imx_aipstz_init(aipstz); -#if DEBUG_CONSOLE - static console_t console; - console_imx_uart_register(IMX_BOOT_UART_BASE, IMX_BOOT_UART_CLK_IN_HZ, IMX_CONSOLE_BAUDRATE, &console); -#endif + /* This console is only used for boot stage */ + console_set_scope(&console, CONSOLE_FLAG_BOOT); imx8m_caam_init(); diff --git a/plat/imx/imx8m/imx8mq/include/platform_def.h b/plat/imx/imx8m/imx8mq/include/platform_def.h index 4671cd3af..103f2e408 100644 --- a/plat/imx/imx8m/imx8mq/include/platform_def.h +++ b/plat/imx/imx8m/imx8mq/include/platform_def.h @@ -127,5 +127,4 @@ #define COUNTER_FREQUENCY 8333333 /* 25MHz / 3 */ -#define DEBUG_CONSOLE 0 #define IMX_WDOG_B_RESET