Merge "Fix type of cot_desc_ptr" into integration

This commit is contained in:
John Tsichritzis 2019-06-17 11:51:24 +00:00 committed by TrustedFirmware Code Review
commit 97c9a42d09
2 changed files with 3 additions and 4 deletions

View File

@ -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,

View File

@ -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 */