aboutsummaryrefslogtreecommitdiff
path: root/bl31
diff options
context:
space:
mode:
authorGy├Ârgy Szing <gyorgy.szing@arm.com>2019-12-20 10:33:43 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2019-12-20 10:33:43 +0000
commitb8e17967bb4eaf0a28870ecb3f3b45a1e5479fe0 (patch)
tree2044883c4b4f9280f713207793e1ffbee706b1e3 /bl31
parent2f227d5156c0a0a22268c3eeb1418b87345d56ac (diff)
parent0531ada53798d7e700410c96f1889069c35127b7 (diff)
downloadtrusted-firmware-a-b8e17967bb4eaf0a28870ecb3f3b45a1e5479fe0.tar.gz
Merge changes from topic "bs/pmf32" into integration
* changes: pmf: Make the runtime instrumentation work on AArch32 SiP: Don't validate entrypoint if state switch is impossible
Diffstat (limited to 'bl31')
-rw-r--r--bl31/aarch64/bl31_entrypoint.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S
index 74b0993f3a..665a05e889 100644
--- a/bl31/aarch64/bl31_entrypoint.S
+++ b/bl31/aarch64/bl31_entrypoint.S
@@ -9,7 +9,7 @@
#include <arch.h>
#include <common/bl_common.h>
#include <el3_common_macros.S>
-#include <lib/pmf/pmf_asm_macros.S>
+#include <lib/pmf/aarch64/pmf_asm_macros.S>
#include <lib/runtime_instr.h>
#include <lib/xlat_tables/xlat_mmu_helpers.h>