diff options
| author | Mark Dykes <mardyk01@review.trustedfirmware.org> | 2020-03-10 18:34:56 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-03-10 18:34:56 +0000 |
| commit | f09852c97bc5de46d7322f2d1532fdddbd787043 (patch) | |
| tree | b9d88f6e889429bf9ebb959de4000d5c4293c83f /include | |
| parent | 46b3003b052cd56e68fb68d38e3697f42ade2170 (diff) | |
| parent | 88005701ece84522f419d8176460f7e9d9ea7240 (diff) | |
| download | platform_external_arm-trusted-firmware-f09852c97bc5de46d7322f2d1532fdddbd787043.tar.gz platform_external_arm-trusted-firmware-f09852c97bc5de46d7322f2d1532fdddbd787043.tar.bz2 platform_external_arm-trusted-firmware-f09852c97bc5de46d7322f2d1532fdddbd787043.zip | |
Merge changes from topic "sb/dualroot" into integration
* changes:
plat/arm: Pass cookie argument down to arm_get_rotpk_info()
plat/arm: Add support for dualroot CoT
plat/arm: Provide some PROTK files for development
Diffstat (limited to 'include')
| -rw-r--r-- | include/plat/arm/common/plat_arm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/plat/arm/common/plat_arm.h b/include/plat/arm/common/plat_arm.h index ff1b9799a..babde41fe 100644 --- a/include/plat/arm/common/plat_arm.h +++ b/include/plat/arm/common/plat_arm.h @@ -268,7 +268,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); |