commit c48bb6c1c22abc24c44e8ec5d787796e5e320832
author Jamie Fox <jamie.fox@arm.com> Thu Dec 01 15:51:43 2022 +0000
committer David Hu <david.hu@arm.com> Tue Dec 06 03:27:26 2022 +0100
tree 6f4d292d853027aa749463ab56f5205ca8f67348
parent 6408297317523a15dcc31c9b74c68f2e49717b2a

Platform: Fix warnings in RSS build

Fixes some miscellaneous warnings that occur in the RSS build.

Signed-off-by: Jamie Fox <jamie.fox@arm.com>
Change-Id: I040a9156018517f25acf6e4ce9ae2fab0e0c3d27

bl2/src/shared_data.c

diff --git a/bl2/src/shared_data.c b/bl2/src/shared_data.c
index 8faff6e..cb51b66 100644
--- a/bl2/src/shared_data.c
+++ b/bl2/src/shared_data.c
@@ -167,12 +167,12 @@
 int boot_save_shared_data(const struct image_header *hdr,
                           const struct flash_area *fap)
 {
-    struct image_version image_ver;
     const struct flash_area *temp_fap;
     uint8_t mcuboot_image_id = 0;
     uint8_t i;
     int32_t rc;
 #ifdef TFM_PARTITION_FIRMWARE_UPDATE
+    struct image_version image_ver;
     uint16_t fwu_minor;
 #endif
 #if defined(CONFIG_TFM_BOOT_STORE_MEASUREMENTS) && !defined(MCUBOOT_MEASURED_BOOT)
@@ -211,9 +211,9 @@
         return -1;
     }
 
+#ifdef TFM_PARTITION_FIRMWARE_UPDATE
     image_ver = hdr->ih_ver;
 
-#ifdef TFM_PARTITION_FIRMWARE_UPDATE
     /* Currently hardcode it to 0 which indicates the full image. */
     fwu_minor = SET_FWU_MINOR(mcuboot_image_id, SW_VERSION);
     rc = boot_add_data_to_shared_area(TLV_MAJOR_FWU,