Filter out invalid configure for EL3_PAYLOAD_BASE
authorQixiang Xu <qixiang.xu@arm.com>
Thu, 24 Aug 2017 03:03:23 +0000 (11:03 +0800)
committerQixiang Xu <qixiang.xu@arm.com>
Fri, 8 Sep 2017 02:47:25 +0000 (10:47 +0800)
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

index 0a64514605da0ed8a9a15fdb5e58f956aabe2e04..267fc823825be48f3ea85f139ac1d09824f97247 100644 (file)
--- 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)