Skip to content

GitLab

Commit 50915b89 authored by davidcunado-arm's avatar davidcunado-arm Committed by GitHub
Browse files

Merge pull request #1091 from geesun/qx/el3_payload_base_cfg_check 

Filter out invalid configure for EL3_PAYLOAD_BASE
parents 487c869d 76580f3d
Show whitespace changes
Inline Side-by-side
Makefile
View file @ 50915b89
...@@ -305,6 +305,12 @@ ifdef EL3_PAYLOAD_BASE ...@@ -305,6 +305,12 @@ ifdef EL3_PAYLOAD_BASE
$(warning "PRELOADED_BL33_BASE and EL3_PAYLOAD_BASE are \ $(warning "PRELOADED_BL33_BASE and EL3_PAYLOAD_BASE are \
incompatible build options. EL3_PAYLOAD_BASE has priority.") incompatible build options. EL3_PAYLOAD_BASE has priority.")
endif 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 endif
ifeq (${NEED_BL33},yes) ifeq (${NEED_BL33},yes)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment