commit fdd716eccbae032eeb6a5887b361f0d568d4f9bc
author Andrew Scull <ascull@google.com> Thu Dec 20 05:37:31 2018 +0000
committer Andrew Scull <ascull@google.com> Thu Dec 20 11:21:53 2018 +0000
tree 4be94e415630d20af78ba347962b2b1110e57f8d
parent cd3e77ef3a7fecd8a937438ae7a8c489344091a4

Replace dlog_nosync with lock enabling.

This avoids confusion over which version of dlog needs to be used and
matches the mpool approach.

Change-Id: I8cf2f6204489d0a4cd2bf8ee9bdfc7cc81003e41

src/main.c

diff --git a/src/main.c b/src/main.c
index 1ea4ed9..bb19e5a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -46,13 +46,13 @@
 
 	/* TODO: Block all CPUs. */
 
-	dlog_nosync("Panic: ");
+	dlog("Panic: ");
 
 	va_start(args, fmt);
-	vdlog_nosync(fmt, args);
+	vdlog(fmt, args);
 	va_end(args);
 
-	dlog_nosync("\n");
+	dlog("\n");
 
 	for (;;) {
 	}
@@ -71,7 +71,7 @@
 	size_t i;
 	struct mpool ppool;
 
-	dlog_nosync("Initialising hafnium\n");
+	dlog("Initialising hafnium\n");
 
 	mpool_init(&ppool, sizeof(struct mm_page_table));
 	mpool_add_chunk(&ppool, ptable_buf, sizeof(ptable_buf));
@@ -83,6 +83,7 @@
 	}
 
 	/* Enable locks now that mm is initialised. */
+	dlog_enable_lock();
 	mpool_enable_locks();
 
 	if (!plat_get_boot_params(&params, &ppool)) {