From 11d05a77295885f27530cf07029ebc2b36f49918 Mon Sep 17 00:00:00 2001 From: Sughosh Ganu Date: Thu, 1 Feb 2024 12:51:20 +0530 Subject: [PATCH] feat(fwu): add a config flag for including image info in the FWU metadata The version 2 of the FWU metadata structure is designed such that the information on the updatable images can be omitted from the metadata structure. Add a configuration flag, PSA_FWU_METADATA_FW_STORE_DESC, which is used to select whether the metadata structure has this information included or not. It's value is set to 1 by default. Change-Id: I4463a20c94d2c745ddb0b2cc8932c12d418fbd42 Signed-off-by: Sughosh Ganu --- Makefile | 2 ++ make_helpers/defaults.mk | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/Makefile b/Makefile index 6a1ea99a6..53d391e89 100644 --- a/Makefile +++ b/Makefile @@ -1185,6 +1185,7 @@ $(eval $(call assert_booleans,\ COT_DESC_IN_DTB \ USE_SP804_TIMER \ PSA_FWU_SUPPORT \ + PSA_FWU_METADATA_FW_STORE_DESC \ ENABLE_MPMM \ ENABLE_MPMM_FCONF \ FEATURE_DETECTION \ @@ -1360,6 +1361,7 @@ $(eval $(call add_defines,\ NR_OF_FW_BANKS \ NR_OF_IMAGES_IN_FW_BANK \ PSA_FWU_SUPPORT \ + PSA_FWU_METADATA_FW_STORE_DESC \ ENABLE_BRBE_FOR_NS \ ENABLE_TRBE_FOR_NS \ ENABLE_SYS_REG_TRACE_FOR_NS \ diff --git a/make_helpers/defaults.mk b/make_helpers/defaults.mk index 180207791..7fe8bf81d 100644 --- a/make_helpers/defaults.mk +++ b/make_helpers/defaults.mk @@ -351,6 +351,14 @@ NR_OF_IMAGES_IN_FW_BANK := 1 # Disable Firmware update support by default PSA_FWU_SUPPORT := 0 +# Enable image description in FWU metadata by default when PSA_FWU_SUPPORT +# is enabled. +ifeq ($(PSA_FWU_SUPPORT),1) +PSA_FWU_METADATA_FW_STORE_DESC := 1 +else +PSA_FWU_METADATA_FW_STORE_DESC := 0 +endif + # Dynamic Root of Trust for Measurement support DRTM_SUPPORT := 0