From 9b514f83121fc03f5a519254df9a04200503ae20 Mon Sep 17 00:00:00 2001
From: Damon Duan <danield@nvidia.com>
Date: Mon, 7 Nov 2016 19:37:50 +0800
Subject: [PATCH] Tegra: init the console only if the platform supports it
Some platforms might want to keep the uart console disabled
during boot. This patch checks if the platform supports a
console, before calling console_init().
Change-Id: Icc9c59cb979d91fd0a72e4732403b3284bdd2dfc
Signed-off-by: Damon Duan <danield@nvidia.com>
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
---
plat/nvidia/tegra/common/tegra_bl31_setup.c | 18 +++++++++---------
plat/nvidia/tegra/common/tegra_pm.c | 6 ++++--
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/plat/nvidia/tegra/common/tegra_bl31_setup.c b/plat/nvidia/tegra/common/tegra_bl31_setup.c
index be7092b9e..c499c991c 100644
--- a/plat/nvidia/tegra/common/tegra_bl31_setup.c
+++ b/plat/nvidia/tegra/common/tegra_bl31_setup.c
@@ -188,18 +188,18 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2,
* Get the base address of the UART controller to be used for the
* console
*/
- assert(plat_params->uart_id);
tegra_console_base = plat_get_console_from_id(plat_params->uart_id);
- /*
- * Configure the UART port to be used as the console
- */
- assert(tegra_console_base);
- console_init(tegra_console_base, TEGRA_BOOT_UART_CLK_IN_HZ,
- TEGRA_CONSOLE_BAUDRATE);
+ if (tegra_console_base != (uint64_t)0) {
+ /*
+ * Configure the UART port to be used as the console
+ */
+ console_init(tegra_console_base, TEGRA_BOOT_UART_CLK_IN_HZ,
+ TEGRA_CONSOLE_BAUDRATE);
- /* Initialise crash console */
- plat_crash_console_init();
+ /* Initialise crash console */
+ plat_crash_console_init();
+ }
/*
* Do initial security configuration to allow DRAM/device access.
diff --git a/plat/nvidia/tegra/common/tegra_pm.c b/plat/nvidia/tegra/common/tegra_pm.c
index 751243657..5376d5231 100644
--- a/plat/nvidia/tegra/common/tegra_pm.c
+++ b/plat/nvidia/tegra/common/tegra_pm.c
@@ -214,8 +214,10 @@ void tegra_pwr_domain_on_finish(const psci_power_state_t *target_state)
PSTATE_ID_SOC_POWERDN) {
/* Initialize the runtime console */
- console_init(tegra_console_base, TEGRA_BOOT_UART_CLK_IN_HZ,
- TEGRA_CONSOLE_BAUDRATE);
+ if (tegra_console_base != (uint64_t)0) {
+ console_init(tegra_console_base, TEGRA_BOOT_UART_CLK_IN_HZ,
+ TEGRA_CONSOLE_BAUDRATE);
+ }
/*
* Restore Memory Controller settings as it loses state
--
GitLab