From 442e09284220b023ab79cce89058039751f42d5b Mon Sep 17 00:00:00 2001
From: Paul Beesley <paul.beesley@arm.com>
Date: Tue, 15 Oct 2019 14:20:34 +0000
Subject: [PATCH] spm-mm: Rename component makefile

Change-Id: Idcd2a35cd2b30d77a7ca031f7e0172814bdb8cab
Signed-off-by: Paul Beesley <paul.beesley@arm.com>
---
 bl31/bl31.mk                                  | 2 +-
 services/std_svc/spm_mm/{spm.mk => spm_mm.mk} | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename services/std_svc/spm_mm/{spm.mk => spm_mm.mk} (70%)

diff --git a/bl31/bl31.mk b/bl31/bl31.mk
index 33d414dcd..7e1b51dc0 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
similarity index 70%
rename from services/std_svc/spm_mm/spm.mk
rename to services/std_svc/spm_mm/spm_mm.mk
index 3aa10ee55..4812e75fb 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/,	\
-- 
GitLab