commit 01a497c2c03f95a11aab48714b5fb3a907195f5b
author shejia01 <jianliang.shen@arm.com> Wed Apr 21 10:04:07 2021 +0800
committer Anton Komlev <Anton.Komlev@arm.com> Thu May 06 00:34:13 2021 +0200
tree 3266a247eb8989de0c99205574af1ef4e6e101a3
parent bc8493014af69c9a5a568426362bce7f94fadc9e

Build: Fix some build warnings.

The GNU Arm Embedded Toolchain 9-2020-q2 update carries out more
strict inspections.This patch redefines variables in spm_func.c
to avoid the warnings.

Signed-off-by: Jianliang Shen <jianliang.shen@arm.com>
Change-Id: Idc3ac7e0fa240af6620c626f23329bc1f2c37df2

secure_fw/spm/cmsis_func/spm_func.c

diff --git a/secure_fw/spm/cmsis_func/spm_func.c b/secure_fw/spm/cmsis_func/spm_func.c
index b85463f..8f77cdb 100644
--- a/secure_fw/spm/cmsis_func/spm_func.c
+++ b/secure_fw/spm/cmsis_func/spm_func.c
@@ -55,7 +55,7 @@
 static uint32_t *tfm_secure_stack_seal =
     ((uint32_t *)&REGION_NAME(Image$$, TFM_SECURE_STACK, $$ZI$$Limit)[-1]) - 2;
 
-REGION_DECLARE_T(Image$$, ARM_LIB_STACK_SEAL, $$ZI$$Base, uint32_t);
+REGION_DECLARE_T(Image$$, ARM_LIB_STACK_SEAL, $$ZI$$Base, uint32_t)[];
 
 /*
  * Function to seal the psp stacks for Function model of TF-M.
@@ -86,8 +86,8 @@
      * Seal the ARM_LIB_STACK by writing the seal value to the reserved
      * region.
      */
-    uint32_t *arm_lib_stck_seal_base = (uint32_t *)&REGION_NAME(Image$$,
-                                       ARM_LIB_STACK_SEAL, $$ZI$$Base);
+    uint32_t *arm_lib_stck_seal_base =
+        ((uint32_t *)&REGION_NAME(Image$$, ARM_LIB_STACK_SEAL, $$ZI$$Base)[-1]) - 2;
 
     *(arm_lib_stck_seal_base) = TFM_STACK_SEAL_VALUE;
     *(arm_lib_stck_seal_base + 1) = TFM_STACK_SEAL_VALUE;
@@ -802,7 +802,7 @@
                              struct tfm_sfn_req_s *desc_ptr, uint32_t excReturn)
 {
     enum tfm_status_e res;
-    struct iovec_params_t iovecs;
+    struct iovec_params_t iovecs = {0};
 
     res = tfm_check_sfn_req_integrity(desc_ptr);
     if (res != TFM_SUCCESS) {