commit beec71cc1acf29dbe949b9d423a4ab9a7775eec1
author John Tsichritzis <john.tsichritzis@arm.com> Mon Jun 17 11:51:24 2019 +0000
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Mon Jun 17 11:51:24 2019 +0000
tree a1201a95c239bb1c0d70cf9c8743da5e7bdbef97
parent 714d43a2afc4e677f37740a72999b02e2ea75a9d
parent 25532c743ec4e0fd4cd6b62c1f9b11617557fb37

Merge "Fix type of cot_desc_ptr" into integration

drivers/auth/auth_mod.c

diff --git a/drivers/auth/auth_mod.c b/drivers/auth/auth_mod.c
index 01f8f29..a6538c4 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,

include/drivers/auth/auth_mod.h

diff --git a/include/drivers/auth/auth_mod.h b/include/drivers/auth/auth_mod.h
index 39f5372..6c48124 100644
--- a/include/drivers/auth/auth_mod.h
+++ b/include/drivers/auth/auth_mod.h
@@ -40,11 +40,10 @@
 
 /* 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 */