aboutsummaryrefslogtreecommitdiff
path: root/bl31
diff options
context:
space:
mode:
authordavidcunado-arm <david.cunado@arm.com>2018-02-28 01:26:21 +0000
committerGitHub <noreply@github.com>2018-02-28 01:26:21 +0000
commitc69145fc2a8f1660131f555f286c6989c8343c74 (patch)
tree57f5e8ea7244c33953999e97299b482fbe67a433 /bl31
parent99e198ecd869d33a5948445dd17c5e0920ef5477 (diff)
parent264410306381d4edceeb03b3a0e8db66605427be (diff)
downloadtrusted-firmware-a-c69145fc2a8f1660131f555f286c6989c8343c74.tar.gz
Merge pull request #1286 from antonio-nino-diaz-arm/an/mmu-mismatch
Clarify comments in xlat tables lib and fixes related to the TLB
Diffstat (limited to 'bl31')
-rw-r--r--bl31/aarch64/bl31_entrypoint.S2
-rw-r--r--bl31/bl31.ld.S5
2 files changed, 4 insertions, 3 deletions
diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S
index 924f295aff..0d1077cbd6 100644
--- a/bl31/aarch64/bl31_entrypoint.S
+++ b/bl31/aarch64/bl31_entrypoint.S
@@ -9,7 +9,7 @@
#include <el3_common_macros.S>
#include <pmf_asm_macros.S>
#include <runtime_instr.h>
-#include <xlat_tables_defs.h>
+#include <xlat_mmu_helpers.h>
.globl bl31_entrypoint
.globl bl31_warm_entrypoint
diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S
index dd046c4319..c6a4fe4993 100644
--- a/bl31/bl31.ld.S
+++ b/bl31/bl31.ld.S
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -217,7 +217,8 @@ SECTIONS
/*
* The xlat_table section is for full, aligned page tables (4K).
* Removing them from .bss avoids forcing 4K alignment on
- * the .bss section and eliminates the unecessary zero init
+ * the .bss section. The tables are initialized to zero by the translation
+ * tables library.
*/
xlat_table (NOLOAD) : {
#if ENABLE_SPM