summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorManish V Badarkhe <manish.badarkhe@arm.com>2026-06-30 20:34:41 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2026-06-30 20:34:41 +0000
commitc64fe42d75709fc3da7d0820caf15bce2ca8a2cd (patch)
tree518f75362d7407e2d247d434c1c853c033897fa3 /Makefile
parent599baaa539b3996067b9ce8f0f225c8baa6e0757 (diff)
parent7196825ce71266d6656165657d4936d185bd439b (diff)
downloadarm-trusted-firmware-master.tar.gz
arm-trusted-firmware-master.zip
Merge changes from topic "bl31_lfa_integration" into integrationHEADmaster
* changes: feat(lfa): harden cancel handling and lock around LFA_CANCEL feat(lfa): serialize activate across CPUs and manage rendezvous policy feat(docs): add documentation page for BL31 LFA feat(fvp): add FVP platform support for BL31 live activation feat(lfa): update LFA service to support BL31 live activation feat(lfa): lfa service updates feat(lfa): add relocatable code for BL31 live activation feat(lfa): xlat changes for BL31 LFA feat(lfa): bl31 linker file updates for lfa feat(lfa): add build flag for BL31 LFA support feat: place errata into their own section
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 0d092368c..a0f3ae288 100644
--- a/Makefile
+++ b/Makefile
@@ -521,6 +521,10 @@ ifdef FDT_SOURCES
NEED_FDT := yes
endif #(FDT_SOURCES)
+ifneq (${ENABLE_LFA_BL31},0)
+ CTX_INCLUDE_EL2_REGS := 1
+endif #(ENABLE_LFA_BL31)
+
################################################################################
# Include libraries' Makefile that are used in all BL
################################################################################
@@ -651,6 +655,7 @@ $(eval $(call assert_booleans,\
PRESERVE_DSU_PMU_REGS \
HOB_LIST \
LFA_SUPPORT \
+ ENABLE_LFA_BL31 \
SUPPORT_SP_LIVE_ACTIVATION \
TEST_IO_SHORT_READ_FI \
SDEI_SUPPORT \
@@ -936,6 +941,7 @@ $(eval $(call add_defines,\
HOB_LIST \
HW_CONFIG_BASE \
LFA_SUPPORT \
+ ENABLE_LFA_BL31 \
SUPPORT_SP_LIVE_ACTIVATION \
TEST_IO_SHORT_READ_FI \
TEST_IO_SHORT_READ_FI_IMAGE_ID \