summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavidcunado-arm <david.cunado@arm.com>2017-09-12 08:44:40 +0100
committerGitHub <noreply@github.com>2017-09-12 08:44:40 +0100
commit50915b891e68e22557f5e3625d881e31fa29f2e2 (patch)
tree9cc6adc377b153e0eedc52790ce02e3a39b48eeb
parent487c869d31a42015c23e1526901fed7ef3ae012d (diff)
parent76580f3d690fce16c2df06cd66130a511f7f23a6 (diff)
Merge pull request #1091 from geesun/qx/el3_payload_base_cfg_check
Filter out invalid configure for EL3_PAYLOAD_BASE
-rw-r--r--Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 0a645146..267fc823 100644
--- a/Makefile
+++ b/Makefile
@@ -305,6 +305,12 @@ ifdef EL3_PAYLOAD_BASE
$(warning "PRELOADED_BL33_BASE and EL3_PAYLOAD_BASE are \
incompatible build options. EL3_PAYLOAD_BASE has priority.")
endif
+ ifneq (${GENERATE_COT},0)
+ $(error "GENERATE_COT and EL3_PAYLOAD_BASE are incompatible build options.")
+ endif
+ ifneq (${TRUSTED_BOARD_BOOT},0)
+ $(error "TRUSTED_BOARD_BOOT and EL3_PAYLOAD_BASE are incompatible build options.")
+ endif
endif
ifeq (${NEED_BL33},yes)