diff options
author | Olivier Deprez <olivier.deprez@arm.com> | 2019-12-20 16:31:06 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-12-20 16:31:06 +0000 |
commit | 91ecca235034c5cd960cf6babb660c1f8d3a0baf (patch) | |
tree | a4c4baa652a2c6f173c881f6d4bf3fe5d13c2a0a /make_helpers | |
parent | b8e17967bb4eaf0a28870ecb3f3b45a1e5479fe0 (diff) | |
parent | 99c69109ec2602eba16d5fa190fef9cd6e5cef22 (diff) | |
download | arm-trusted-firmware-91ecca235034c5cd960cf6babb660c1f8d3a0baf.tar.gz |
Merge changes from topic "spm-devel" into integration
* changes:
spm-mm: Rename aarch64 assembly files
spm-mm: Rename source files
spm-mm: Rename spm_shim_private.h
spm-mm: Rename spm_private.h
spm-mm: Rename component makefile
spm-mm: Remove mm_svc.h header
spm-mm: Refactor spm_svc.h and its contents
spm-mm: Refactor secure_partition.h and its contents
spm: Remove SPM Alpha 1 prototype and support files
Remove dependency between SPM_MM and ENABLE_SPM build flags
Diffstat (limited to 'make_helpers')
-rw-r--r-- | make_helpers/defaults.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/make_helpers/defaults.mk b/make_helpers/defaults.mk index 348b3e52b..1e312362c 100644 --- a/make_helpers/defaults.mk +++ b/make_helpers/defaults.mk @@ -178,11 +178,8 @@ RECLAIM_INIT_CODE := 0 # SPD choice SPD := none -# For including the Secure Partition Manager -ENABLE_SPM := 0 - -# Use the SPM based on MM -SPM_MM := 1 +# Enable the Management Mode (MM)-based Secure Partition Manager implementation +SPM_MM := 0 # Flag to introduce an infinite loop in BL1 just before it exits into the next # image. This is meant to help debugging the post-BL2 phase. |