diff options
-rw-r--r-- | bl31/bl31.mk | 2 | ||||
-rw-r--r-- | services/std_svc/spm_mm/spm_mm.mk (renamed from services/std_svc/spm_mm/spm.mk) | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bl31/bl31.mk b/bl31/bl31.mk index 33d414dcd3..7e1b51dc00 100644 --- a/bl31/bl31.mk +++ b/bl31/bl31.mk @@ -12,7 +12,7 @@ ifeq (${SPM_MM},1) $(error EL3_EXCEPTION_HANDLING must be 1 for SPM-MM support) else $(info Including SPM Management Mode (MM) makefile) - include services/std_svc/spm_mm/spm.mk + include services/std_svc/spm_mm/spm_mm.mk endif endif diff --git a/services/std_svc/spm_mm/spm.mk b/services/std_svc/spm_mm/spm_mm.mk index 3aa10ee556..4812e75fb1 100644 --- a/services/std_svc/spm_mm/spm.mk +++ b/services/std_svc/spm_mm/spm_mm.mk @@ -1,14 +1,14 @@ # -# Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # ifneq (${SPD},none) - $(error "Error: SPD and SPM are incompatible build options.") + $(error "Error: SPD and SPM_MM are incompatible build options.") endif ifneq (${ARCH},aarch64) - $(error "Error: SPM is only supported on aarch64.") + $(error "Error: SPM_MM is only supported on aarch64.") endif SPM_SOURCES := $(addprefix services/std_svc/spm_mm/, \ |