summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2023-03-28 12:27:37 +0200
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2023-03-28 12:27:37 +0200
commit92e93253e48fdddc0676af596b0522253d19271e (patch)
tree9701d3e434f6b285f1be8e26621793072be4eb2f /Makefile
parente24e42c605371c7ead8ef9ba4c84543a0c1a84ff (diff)
parente528bbec74af359714203c7f8d356074733ea9cd (diff)
downloadarm-trusted-firmware-92e93253e48fdddc0676af596b0522253d19271e.tar.gz
Merge changes from topic "psci-osi" into integration
* changes: feat(sc7280): add support for PSCI_OS_INIT_MODE feat(fvp): enable support for PSCI OS-initiated mode feat(psci): update PSCI_FEATURES feat(psci): add support for OS-initiated mode feat(psci): add support for PSCI_SET_SUSPEND_MODE build(psci): add build option for OS-initiated mode docs(psci): add design proposal for OS-initiated mode
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index cc2ac6faa..52d6cf576 100644
--- a/Makefile
+++ b/Makefile
@@ -1120,6 +1120,7 @@ $(eval $(call assert_booleans,\
PLAT_RSS_NOT_SUPPORTED \
PROGRAMMABLE_RESET_ADDRESS \
PSCI_EXTENDED_STATE_ID \
+ PSCI_OS_INIT_MODE \
RESET_TO_BL31 \
RESET_TO_BL31_WITH_PARAMS \
SAVE_KEYS \
@@ -1262,6 +1263,7 @@ $(eval $(call add_defines,\
PLAT_RSS_NOT_SUPPORTED \
PROGRAMMABLE_RESET_ADDRESS \
PSCI_EXTENDED_STATE_ID \
+ PSCI_OS_INIT_MODE \
RAS_EXTENSION \
RESET_TO_BL31 \
RESET_TO_BL31_WITH_PARAMS \