Browse Source

plat/arm: Pass cookie argument down to arm_get_rotpk_info()

The cookie will be leveraged in the next commit.

Change-Id: Ie8bad275d856d84c27466461cf815529dd860446
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>
pull/1938/head
Sandrine Bailleux 5 years ago
parent
commit
88005701ec
  1. 2
      include/plat/arm/common/plat_arm.h
  2. 2
      plat/arm/board/common/board_arm_trusted_boot.c
  3. 2
      plat/arm/board/fvp/fvp_trusted_boot.c
  4. 2
      plat/arm/board/rde1edge/rde1edge_trusted_boot.c
  5. 2
      plat/arm/board/rdn1edge/rdn1edge_trusted_boot.c
  6. 2
      plat/arm/board/sgi575/sgi575_trusted_boot.c
  7. 2
      plat/arm/board/sgm775/sgm775_trusted_boot.c

2
include/plat/arm/common/plat_arm.h

@ -262,7 +262,7 @@ __dead2 void plat_arm_error_handler(int err);
* Optional functions in ARM standard platforms
*/
void plat_arm_override_gicr_frames(const uintptr_t *plat_gicr_frames);
int arm_get_rotpk_info(void **key_ptr, unsigned int *key_len,
int arm_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len,
unsigned int *flags);
int arm_get_rotpk_info_regs(void **key_ptr, unsigned int *key_len,
unsigned int *flags);

2
plat/arm/board/common/board_arm_trusted_boot.c

@ -110,7 +110,7 @@ int arm_get_rotpk_info_cc(void **key_ptr, unsigned int *key_len,
/*
* Wraper function for most Arm platforms to get ROTPK hash.
*/
int arm_get_rotpk_info(void **key_ptr, unsigned int *key_len,
int arm_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len,
unsigned int *flags)
{
#if ARM_CRYPTOCELL_INTEG

2
plat/arm/board/fvp/fvp_trusted_boot.c

@ -30,7 +30,7 @@
int plat_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len,
unsigned int *flags)
{
return arm_get_rotpk_info(key_ptr, key_len, flags);
return arm_get_rotpk_info(cookie, key_ptr, key_len, flags);
}
/*

2
plat/arm/board/rde1edge/rde1edge_trusted_boot.c

@ -22,5 +22,5 @@
int plat_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len,
unsigned int *flags)
{
return arm_get_rotpk_info(key_ptr, key_len, flags);
return arm_get_rotpk_info(cookie, key_ptr, key_len, flags);
}

2
plat/arm/board/rdn1edge/rdn1edge_trusted_boot.c

@ -22,5 +22,5 @@
int plat_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len,
unsigned int *flags)
{
return arm_get_rotpk_info(key_ptr, key_len, flags);
return arm_get_rotpk_info(cookie, key_ptr, key_len, flags);
}

2
plat/arm/board/sgi575/sgi575_trusted_boot.c

@ -22,5 +22,5 @@
int plat_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len,
unsigned int *flags)
{
return arm_get_rotpk_info(key_ptr, key_len, flags);
return arm_get_rotpk_info(cookie, key_ptr, key_len, flags);
}

2
plat/arm/board/sgm775/sgm775_trusted_boot.c

@ -22,5 +22,5 @@
int plat_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len,
unsigned int *flags)
{
return arm_get_rotpk_info(key_ptr, key_len, flags);
return arm_get_rotpk_info(cookie, key_ptr, key_len, flags);
}

Loading…
Cancel
Save