Skip to content

GitLab

Commit 97c9a42d authored by John Tsichritzis's avatar John Tsichritzis Committed by TrustedFirmware Code Review
Browse files

Merge "Fix type of cot_desc_ptr" into integration

parents 45c28e95 2efb7ddc
Hide whitespace changes
Inline Side-by-side
drivers/auth/auth_mod.c
View file @ 97c9a42d
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#pragma weak plat_set_nv_ctr2 #pragma weak plat_set_nv_ctr2
/* Pointer to CoT */ /* 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]; extern unsigned int auth_img_flags[MAX_NUMBER_IDS];
static int cmp_auth_param_type_desc(const auth_param_type_desc_t *a, static int cmp_auth_param_type_desc(const auth_param_type_desc_t *a,
......
include/drivers/auth/auth_mod.h
View file @ 97c9a42d
...@@ -40,11 +40,10 @@ int auth_mod_verify_img(unsigned int img_id, ...@@ -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 */ /* Macro to register a CoT defined as an array of auth_img_desc_t pointers */
#define REGISTER_COT(_cot) \ #define REGISTER_COT(_cot) \
const auth_img_desc_t **const cot_desc_ptr = \ const auth_img_desc_t *const *const cot_desc_ptr = (_cot); \
(const auth_img_desc_t **const)_cot; \
unsigned int auth_img_flags[MAX_NUMBER_IDS] 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]; extern unsigned int auth_img_flags[MAX_NUMBER_IDS];
#endif /* TRUSTED_BOARD_BOOT */ #endif /* TRUSTED_BOARD_BOOT */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment