Browse Source

Tegra: no need to re-init the same console

This patch stops initialising the same UART console, as a "crash"
console. The normal and the crash consoles use the same UART port
and hence the crash console init function now only checks if the
console is ready to be used.

Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
pull/899/head
Varun Wadekar 8 years ago
parent
commit
e87dac6b45
  1. 11
      plat/nvidia/tegra/common/aarch64/tegra_helpers.S
  2. 3
      plat/nvidia/tegra/common/tegra_bl31_setup.c

11
plat/nvidia/tegra/common/aarch64/tegra_helpers.S

@ -243,11 +243,12 @@ endfunc platform_mem_init
* --------------------------------------------- * ---------------------------------------------
*/ */
func plat_crash_console_init func plat_crash_console_init
adr x0, tegra_console_base mov x0, #0
ldr x0, [x0] adr x1, tegra_console_base
mov_imm x1, TEGRA_BOOT_UART_CLK_IN_HZ ldr x1, [x1]
mov_imm x2, TEGRA_CONSOLE_BAUDRATE cbz x1, 1f
b console_core_init mov w0, #1
1: ret
endfunc plat_crash_console_init endfunc plat_crash_console_init
/* --------------------------------------------- /* ---------------------------------------------

3
plat/nvidia/tegra/common/tegra_bl31_setup.c

@ -202,9 +202,6 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2,
*/ */
console_init(tegra_console_base, TEGRA_BOOT_UART_CLK_IN_HZ, console_init(tegra_console_base, TEGRA_BOOT_UART_CLK_IN_HZ,
TEGRA_CONSOLE_BAUDRATE); TEGRA_CONSOLE_BAUDRATE);
/* Initialise crash console */
plat_crash_console_init();
} }
/* /*

Loading…
Cancel
Save