summaryrefslogtreecommitdiff
path: root/plat/common
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2015-12-09 19:03:06 +0000
committerdanh-arm <dan.handley@arm.com>2015-12-09 19:03:06 +0000
commit7ee2b8b3f8d610bf4f0e261ebaf3bd24afc1eea2 (patch)
tree7b20cd6a7200f021d5864bf665ea31c482559fd4 /plat/common
parentab5a53ef0f2f4f19f59a28738ae00c6bb5975d21 (diff)
parent080225dacd7c1e11c53756ec66d72d3573d1a70d (diff)
Merge pull request #462 from soby-mathew/sm/runtime_console
Enable BL31 to configure a runtime console
Diffstat (limited to 'plat/common')
-rw-r--r--plat/common/aarch64/plat_common.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/plat/common/aarch64/plat_common.c b/plat/common/aarch64/plat_common.c
index a6a84765..9070c613 100644
--- a/plat/common/aarch64/plat_common.c
+++ b/plat/common/aarch64/plat_common.c
@@ -28,16 +28,18 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <assert.h>
+#include <console.h>
#include <platform.h>
#include <xlat_tables.h>
/*
- * The following 2 platform setup functions are weakly defined. They
+ * The following platform setup functions are weakly defined. They
* provide typical implementations that may be re-used by multiple
* platforms but may also be overridden by a platform if required.
*/
#pragma weak bl31_plat_enable_mmu
#pragma weak bl32_plat_enable_mmu
+#pragma weak bl31_plat_runtime_setup
void bl31_plat_enable_mmu(uint32_t flags)
{
@@ -49,6 +51,15 @@ void bl32_plat_enable_mmu(uint32_t flags)
enable_mmu_el1(flags);
}
+void bl31_plat_runtime_setup(void)
+{
+ /*
+ * Finish the use of console driver in BL31 so that any runtime logs
+ * from BL31 will be suppressed.
+ */
+ console_uninit();
+}
+
#if !ENABLE_PLAT_COMPAT
/*
* Helper function for platform_get_pos() when platform compatibility is