aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhukar Pappireddy <madhukar.pappireddy@arm.com>2020-08-04 14:21:51 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-08-04 14:21:51 +0000
commit8dd1c3c6c602fe2339b4b9a61ff3261430e4803f (patch)
tree19ab43a0de5d59d7b84e6d7b455413856f9cb517
parent070632f97b88f053b99350688aed43213336d39f (diff)
parent9d9ae9766ef305ac1acefd2b7999676245caa335 (diff)
downloadtrusted-firmware-a-8dd1c3c6c602fe2339b4b9a61ff3261430e4803f.tar.gz
Merge "spm-mm: fix MISRA C-2012 Rule 2.3 spm_mm_boot_info_t defined but never used." into integration
-rw-r--r--plat/arm/board/fvp/fvp_common.c3
-rw-r--r--plat/arm/board/tc0/tc0_plat.c3
-rw-r--r--plat/arm/css/sgi/sgi_plat.c5
3 files changed, 10 insertions, 1 deletions
diff --git a/plat/arm/board/fvp/fvp_common.c b/plat/arm/board/fvp/fvp_common.c
index c5fae56d7a..cb717e053e 100644
--- a/plat/arm/board/fvp/fvp_common.c
+++ b/plat/arm/board/fvp/fvp_common.c
@@ -18,7 +18,10 @@
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <platform_def.h>
+
+#if SPM_MM
#include <services/spm_mm_partition.h>
+#endif
#include "fvp_private.h"
diff --git a/plat/arm/board/tc0/tc0_plat.c b/plat/arm/board/tc0/tc0_plat.c
index b1ec39b589..05461928d2 100644
--- a/plat/arm/board/tc0/tc0_plat.c
+++ b/plat/arm/board/tc0/tc0_plat.c
@@ -15,7 +15,10 @@
#include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h>
#include <drivers/arm/sbsa.h>
+
+#if SPM_MM
#include <services/spm_mm_partition.h>
+#endif
/*
* Table of regions for different BL stages to map using the MMU.
diff --git a/plat/arm/css/sgi/sgi_plat.c b/plat/arm/css/sgi/sgi_plat.c
index b611eaff54..a2117f6c1d 100644
--- a/plat/arm/css/sgi/sgi_plat.c
+++ b/plat/arm/css/sgi/sgi_plat.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -15,7 +15,10 @@
#include <plat/common/platform.h>
#include <drivers/arm/sbsa.h>
#include <sgi_base_platform_def.h>
+
+#if SPM_MM
#include <services/spm_mm_partition.h>
+#endif
#define SGI_MAP_FLASH0_RO MAP_REGION_FLAT(V2M_FLASH0_BASE,\
V2M_FLASH0_SIZE, \