aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitris Papastamos <dimitris.papastamos@arm.com>2018-04-04 09:58:24 +0100
committerGitHub <noreply@github.com>2018-04-04 09:58:24 +0100
commit93883a293145f6c85b3fc8c219f400e28b7d1491 (patch)
treeaf16b192377c81ac7caf430157c4b2dca8a65b10
parentf11916bf1dfecd7ee76240eebd847681ce366a67 (diff)
parentaafd8e1c9f48be0b4716f3ea6390736773c7fbdb (diff)
downloadplatform_external_arm-trusted-firmware-93883a293145f6c85b3fc8c219f400e28b7d1491.tar.gz
platform_external_arm-trusted-firmware-93883a293145f6c85b3fc8c219f400e28b7d1491.tar.bz2
platform_external_arm-trusted-firmware-93883a293145f6c85b3fc8c219f400e28b7d1491.zip
Merge pull request #1338 from antonio-nino-diaz-arm/an/spm-flag-check
SPM: Assert value of `ENABLE_SPM` build flag
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ca91e69a5..ef4e5c681 100644
--- a/Makefile
+++ b/Makefile
@@ -497,6 +497,7 @@ $(eval $(call assert_boolean,ENABLE_PMF))
$(eval $(call assert_boolean,ENABLE_PSCI_STAT))
$(eval $(call assert_boolean,ENABLE_RUNTIME_INSTRUMENTATION))
$(eval $(call assert_boolean,ENABLE_SPE_FOR_LOWER_ELS))
+$(eval $(call assert_boolean,ENABLE_SPM))
$(eval $(call assert_boolean,ENABLE_SVE_FOR_NS))
$(eval $(call assert_boolean,ERROR_DEPRECATED))
$(eval $(call assert_boolean,GENERATE_COT))
@@ -541,6 +542,7 @@ $(eval $(call add_define,ENABLE_PMF))
$(eval $(call add_define,ENABLE_PSCI_STAT))
$(eval $(call add_define,ENABLE_RUNTIME_INSTRUMENTATION))
$(eval $(call add_define,ENABLE_SPE_FOR_LOWER_ELS))
+$(eval $(call add_define,ENABLE_SPM))
$(eval $(call add_define,ENABLE_SVE_FOR_NS))
$(eval $(call add_define,ERROR_DEPRECATED))
$(eval $(call add_define,GICV2_G0_FOR_EL3))
@@ -555,7 +557,6 @@ $(eval $(call add_define,PROGRAMMABLE_RESET_ADDRESS))
$(eval $(call add_define,PSCI_EXTENDED_STATE_ID))
$(eval $(call add_define,RESET_TO_BL31))
$(eval $(call add_define,SEPARATE_CODE_AND_RODATA))
-$(eval $(call add_define,ENABLE_SPM))
$(eval $(call add_define,SPD_${SPD}))
$(eval $(call add_define,SPIN_ON_BL1_EXIT))
$(eval $(call add_define,TRUSTED_BOARD_BOOT))