From 04f2a959f5fa88d9b389c24dc12eff4a561b4412 Mon Sep 17 00:00:00 2001 From: Nitin Garg Date: Wed, 24 May 2017 17:39:14 -0500 Subject: i.MX8QM: disable debug console by default Disable ATF console output for iMX8QM Signed-off-by: Nitin Garg --- plat/imx/imx8qm/imx8qm_bl31_setup.c | 4 ++++ plat/imx/imx8qm/include/platform_def.h | 3 ++- plat/imx/imx8qm/platform.mk | 1 + plat/imx/imx8qxp/platform.mk | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) (limited to 'plat') diff --git a/plat/imx/imx8qm/imx8qm_bl31_setup.c b/plat/imx/imx8qm/imx8qm_bl31_setup.c index 0da9fa46..1f461064 100644 --- a/plat/imx/imx8qm/imx8qm_bl31_setup.c +++ b/plat/imx/imx8qm/imx8qm_bl31_setup.c @@ -91,6 +91,7 @@ static uint32_t get_spsr_for_bl33_entry(void) return spsr; } +#if DEBUG_CONSOLE_A53 static void lpuart32_serial_setbrg(unsigned int base, int baudrate) { unsigned int sbr, osr, baud_diff, tmp_osr, tmp_sbr, tmp_diff, tmp; @@ -182,6 +183,7 @@ static int lpuart32_serial_init(unsigned int base) return 0; } +#endif void mx8_partition_resources(void) { @@ -236,6 +238,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, /* No console available now */ while (1); } +#if DEBUG_CONSOLE_A53 /* This maybe updated, need to check SCFW */ #define SC_P_UART0_RX 30 #define SC_P_UART0_TX 31 @@ -262,6 +265,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, sc_pad_set(ipc_handle, SC_P_UART0_CTS_B, 0xc600004c); lpuart32_serial_init(IMX_BOOT_UART_BASE); +#endif #if DEBUG_CONSOLE console_init(IMX_BOOT_UART_BASE, IMX_BOOT_UART_CLK_IN_HZ, diff --git a/plat/imx/imx8qm/include/platform_def.h b/plat/imx/imx8qm/include/platform_def.h index 5579ee06..ec3d463d 100644 --- a/plat/imx/imx8qm/include/platform_def.h +++ b/plat/imx/imx8qm/include/platform_def.h @@ -87,5 +87,6 @@ * open debug console, need to comment out console_uninit in * ./plat/common/aarch64/plat_common.c as well. */ -#define DEBUG_CONSOLE 1 +#define DEBUG_CONSOLE 0 +#define DEBUG_CONSOLE_A53 0 #define PLAT_IMX8QM 1 diff --git a/plat/imx/imx8qm/platform.mk b/plat/imx/imx8qm/platform.mk index 5bea6f43..a1296e2a 100644 --- a/plat/imx/imx8qm/platform.mk +++ b/plat/imx/imx8qm/platform.mk @@ -58,3 +58,4 @@ MULTI_CONSOLE_API := 1 USE_COHERENT_MEM := 0 RESET_TO_BL31 := 1 ERROR_DEPRECATED := 1 +A53_DISABLE_NON_TEMPORAL_HINT := 0 diff --git a/plat/imx/imx8qxp/platform.mk b/plat/imx/imx8qxp/platform.mk index 3ffea58b..392a8233 100644 --- a/plat/imx/imx8qxp/platform.mk +++ b/plat/imx/imx8qxp/platform.mk @@ -57,3 +57,4 @@ USE_COHERENT_MEM := 0 RESET_TO_BL31 := 1 ERROR_DEPRECATED := 1 ARM_GIC_ARCH := 3 +A53_DISABLE_NON_TEMPORAL_HINT := 0 -- cgit v1.2.3