andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1091 from geesun/qx/el3_payload_base_cfg_check 

Filter out invalid configure for EL3_PAYLOAD_BASE
This commit is contained in:
davidcunado-arm 2017-09-12 08:44:40 +01:00 committed by GitHub
parent 487c869d31 76580f3d69
commit 50915b891e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -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)