commit be9bd9d98d412cd637361762fb07190263e34d97
author Qixiang Xu <qixiang.xu@arm.com> Thu Aug 24 11:03:23 2017 +0800
committer Qixiang Xu <qixiang.xu@arm.com> Fri Sep 08 10:47:25 2017 +0800
tree 049e8bd1011fbb456d69de409e2f085a5bd05f00
parent 512d84c143751cc39a077048a95b6d0fad3960fd

Filter out invalid configure for EL3_PAYLOAD_BASE

TRUSTED_BOARD_BOOT and GENERATE_COT is not
compatible with EL3_PAYLOAD_BASE

Change-Id: I538c77e1f6c7da400d30ae4d633b8fcc55742202
Signed-off-by: Qixiang Xu <qixiang.xu@arm.com>

Makefile

diff --git a/Makefile b/Makefile
index 0a64514..267fc82 100644
--- a/Makefile
+++ b/Makefile
@@ -305,6 +305,12 @@
                 $(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)