summaryrefslogtreecommitdiff
path: root/plat
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2016-11-22 10:49:57 +0000
committerGitHub <noreply@github.com>2016-11-22 10:49:57 +0000
commit5c0df525aca2bdae8cf8c1215eb523c24567f559 (patch)
tree0ba530decb8b05880ede032e40113f695524c7d4 /plat
parent5ff74aafe3bce08014b64646ad65d0039d15181f (diff)
parent91a422d69f651784f8cbfbd7d2805f1beb448838 (diff)
Merge pull request #762 from douglas-raillard-arm/dr/doc_build_info
Clarify dependency for PSCI_EXTENDED_STATE_ID
Diffstat (limited to 'plat')
-rw-r--r--plat/arm/common/arm_common.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk
index 8f8d3fd8..626b443e 100644
--- a/plat/arm/common/arm_common.mk
+++ b/plat/arm/common/arm_common.mk
@@ -58,11 +58,12 @@ endif
# State-ID encoding to be parsed.
ARM_RECOM_STATE_ID_ENC := 0
-# If the PSCI_EXTENDED_STATE_ID is set, then the recommended state ID need to
-# be used. Else throw a build error.
+# If the PSCI_EXTENDED_STATE_ID is set, then ARM_RECOM_STATE_ID_ENC need to
+# be set. Else throw a build error.
ifeq (${PSCI_EXTENDED_STATE_ID}, 1)
ifeq (${ARM_RECOM_STATE_ID_ENC}, 0)
- $(error "Incompatible STATE_ID build option specified")
+ $(error Build option ARM_RECOM_STATE_ID_ENC needs to be set if \
+ PSCI_EXTENDED_STATE_ID is set for ARM platforms)
endif
endif