commit 937f669872b5516c9a0fd3d60f9618ad54a72b5c
author Soby Mathew <soby.mathew@arm.com> Mon Oct 21 12:10:16 2019 +0000
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Mon Oct 21 12:10:16 2019 +0000
tree 338e4996cecb8db24c268a40715073aac18515d2
parent 942bb52e99f317579256b5d146b43221b1788fac
parent 0e7a0540d728122913afbc99df4c4b87a19e8048

Merge "xlat_table_v2: Fix enable WARMBOOT_ENABLE_DCACHE_EARLY config" into integration

lib/xlat_tables_v2/xlat_tables_utils.c

diff --git a/lib/xlat_tables_v2/xlat_tables_utils.c b/lib/xlat_tables_v2/xlat_tables_utils.c
index 232142e..30babc6 100644
--- a/lib/xlat_tables_v2/xlat_tables_utils.c
+++ b/lib/xlat_tables_v2/xlat_tables_utils.c
@@ -551,7 +551,7 @@
 		 * before writing the new descriptor.
 		 */
 		*entry = INVALID_DESC;
-#if !(HW_ASSISTED_COHERENCY || WARMBOOT_ENABLE_DCACHE_EARLY)
+#if !HW_ASSISTED_COHERENCY
 		dccvac((uintptr_t)entry);
 #endif
 		/* Invalidate any cached copy of this mapping in the TLBs. */
@@ -562,7 +562,7 @@
 
 		/* Write new descriptor */
 		*entry = xlat_desc(ctx, new_attr, addr_pa, level);
-#if !(HW_ASSISTED_COHERENCY || WARMBOOT_ENABLE_DCACHE_EARLY)
+#if !HW_ASSISTED_COHERENCY
 		dccvac((uintptr_t)entry);
 #endif
 		base_va += PAGE_SIZE;