diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2019-06-07 14:33:51 +0200 |
|---|---|---|
| committer | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2019-06-13 12:53:17 +0200 |
| commit | 2efb7ddc3b77a1ff11921083f290aebedbc935a2 (patch) | |
| tree | 58509eb3e20646dadef3bf970bf557cc85fa56dc | |
| parent | dc593ddc07fc942fd1c43106b7783550a8ad6714 (diff) | |
Fix type of cot_desc_ptr
The chain of trust description and the pointer pointing to its first
element were incompatible, thus requiring an explicit type cast for
the assignment.
- cot_desc was an array of
const pointers to const image descriptors.
- cot_desc_ptr was a const pointer to
(non-constant) pointers to const image descriptors.
Thus, trying to assign cot_desc to cot_desc_ptr (with no cast) would
generate the following compiler warning:
drivers/auth/tbbr/tbbr_cot.c:826:14: warning: initialization discards
‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
REGISTER_COT(cot_desc);
^~~~~~~~
Change-Id: Iae62dd1bdb43fe379e3843d96461d47cc2f68a06
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>
| -rw-r--r-- | drivers/auth/auth_mod.c | 2 | ||||
| -rw-r--r-- | include/drivers/auth/auth_mod.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/auth/auth_mod.c b/drivers/auth/auth_mod.c index 01f8f290..a6538c4e 100644 --- a/drivers/auth/auth_mod.c +++ b/drivers/auth/auth_mod.c @@ -31,7 +31,7 @@ #pragma weak plat_set_nv_ctr2 /* Pointer to CoT */ -extern const auth_img_desc_t **const cot_desc_ptr; +extern const auth_img_desc_t *const *const cot_desc_ptr; extern unsigned int auth_img_flags[MAX_NUMBER_IDS]; static int cmp_auth_param_type_desc(const auth_param_type_desc_t *a, diff --git a/include/drivers/auth/auth_mod.h b/include/drivers/auth/auth_mod.h index 39f5372e..6c48124b 100644 --- a/include/drivers/auth/auth_mod.h +++ b/include/drivers/auth/auth_mod.h @@ -40,11 +40,10 @@ int auth_mod_verify_img(unsigned int img_id, /* Macro to register a CoT defined as an array of auth_img_desc_t pointers */ #define REGISTER_COT(_cot) \ - const auth_img_desc_t **const cot_desc_ptr = \ - (const auth_img_desc_t **const)_cot; \ + const auth_img_desc_t *const *const cot_desc_ptr = (_cot); \ unsigned int auth_img_flags[MAX_NUMBER_IDS] -extern const auth_img_desc_t **const cot_desc_ptr; +extern const auth_img_desc_t *const *const cot_desc_ptr; extern unsigned int auth_img_flags[MAX_NUMBER_IDS]; #endif /* TRUSTED_BOARD_BOOT */ |