commit 0e936516d16fda52e6586b28c88f3626e219c28a
author Mate Toth-Pal <mate.toth-pal@arm.com> Thu Oct 19 15:02:20 2023 +0200
committer Soby Mathew <soby.mathew@arm.com> Fri Nov 03 14:18:38 2023 +0000
tree 6dc8c5137d61bc482f94c0be0b917574a3a9bad8
parent 7e3727a11d4575211930edd2cf27cf610891ce00

refactor(cbmc): make granule related buffers global

Change-Id: Ib31e826e9e98fd80d831f41408f32de274bfefad
Signed-off-by: Mate Toth-Pal <mate.toth-pal@arm.com>

lib/realm/src/granule.c

diff --git a/lib/realm/src/granule.c b/lib/realm/src/granule.c
index d0f420b..e51df09 100644
--- a/lib/realm/src/granule.c
+++ b/lib/realm/src/granule.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <utils_def.h>
 
-static struct granule granules[RMM_MAX_GRANULES];
+IF_NCBMC(static) struct granule granules[RMM_MAX_GRANULES];
 
 /*
  * Takes a valid pointer to a struct granule, and returns the granule physical

plat/host/common/src/host_utils.c

diff --git a/plat/host/common/src/host_utils.c b/plat/host/common/src/host_utils.c
index 34eaa83..8967c1c 100644
--- a/plat/host/common/src/host_utils.c
+++ b/plat/host/common/src/host_utils.c
@@ -13,6 +13,7 @@
 #include <plat_common.h>
 #include <rmm_el3_ifc.h>
 #include <string.h>
+#include <utils_def.h>
 #include <xlat_tables.h>
 
 static struct sysreg_data sysregs[SYSREG_MAX_CBS];
@@ -24,7 +25,7 @@
  * Allocate memory to emulate physical memory to initialize the
  * granule library.
  */
-static unsigned char granules_buffer[HOST_MEM_SIZE] __aligned(GRANULE_SIZE);
+IF_NCBMC(static) unsigned char granules_buffer[HOST_MEM_SIZE] __aligned(GRANULE_SIZE);
 
 /*
  * Define and set the Boot Interface arguments.