diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2018-01-19 13:40:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-19 13:40:12 +0000 |
| commit | 0d3a27e7f6ee3fa1be4c705927bcf9cad3750809 (patch) | |
| tree | 6ff8104078387889e039eb2e7a0e9cf87fac4691 /make_helpers | |
| parent | 0caaa03bf182429e40d8785e4a9017c443841a52 (diff) | |
| parent | 76d267334626312adf48c8aad52a0f4178e64d61 (diff) | |
Merge pull request #1200 from robertovargas-arm/bl2-el3
Add BL2_AT_EL3 build option
Diffstat (limited to 'make_helpers')
| -rw-r--r-- | make_helpers/defaults.mk | 3 | ||||
| -rw-r--r-- | make_helpers/tbbr/tbbr_tools.mk | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/make_helpers/defaults.mk b/make_helpers/defaults.mk index fa0d17de..643890f6 100644 --- a/make_helpers/defaults.mk +++ b/make_helpers/defaults.mk @@ -27,6 +27,9 @@ ARM_GIC_ARCH := 2 # Base commit to perform code check on BASE_COMMIT := origin/master +# Execute BL2 at EL3 +BL2_AT_EL3 := 0 + # By default, consider that the platform may release several CPUs out of reset. # The platform Makefile is free to override this value. COLD_BOOT_SINGLE_CPU := 0 diff --git a/make_helpers/tbbr/tbbr_tools.mk b/make_helpers/tbbr/tbbr_tools.mk index 6e6e2739..cda8d726 100644 --- a/make_helpers/tbbr/tbbr_tools.mk +++ b/make_helpers/tbbr/tbbr_tools.mk @@ -64,7 +64,9 @@ $(if ${NON_TRUSTED_WORLD_KEY},$(eval $(call CERT_ADD_CMD_OPT,${NON_TRUSTED_WORLD $(if ${BL2},$(eval $(call CERT_ADD_CMD_OPT,${BL2},--tb-fw,true)),\ $(eval $(call CERT_ADD_CMD_OPT,$(call IMG_BIN,2),--tb-fw,true))) $(eval $(call CERT_ADD_CMD_OPT,${BUILD_PLAT}/tb_fw.crt,--tb-fw-cert)) +ifeq (${BL2_AT_EL3}, 0) $(eval $(call FIP_ADD_PAYLOAD,${BUILD_PLAT}/tb_fw.crt,--tb-fw-cert)) +endif # Add the SCP_BL2 CoT (key cert + img cert + image) ifneq (${SCP_BL2},) |