diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2020-02-11 16:15:45 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-02-11 16:15:45 +0000 |
| commit | 21c4f56fa7335fbfd3aeb1175b38b84ef9c798ec (patch) | |
| tree | aa6c50e7b657592f39dc2c4286095575eda0a5c6 /drivers | |
| parent | 63aa4094fb08d262546afa51d33611a8be0bc4d2 (diff) | |
| parent | 97399821256653115c9d6b5d3233934aa7689c0c (diff) | |
| download | platform_external_arm-trusted-firmware-21c4f56fa7335fbfd3aeb1175b38b84ef9c798ec.tar.gz platform_external_arm-trusted-firmware-21c4f56fa7335fbfd3aeb1175b38b84ef9c798ec.tar.bz2 platform_external_arm-trusted-firmware-21c4f56fa7335fbfd3aeb1175b38b84ef9c798ec.zip | |
Merge changes from topic "lm/fconf" into integration
* changes:
arm-io: Panic in case of io setup failure
MISRA fix: Use boolean essential type
fconf: Add documentation
fconf: Move platform io policies into fconf
fconf: Add mbedtls shared heap as property
fconf: Add TBBR disable_authentication property
fconf: Add dynamic config DTBs info as property
fconf: Populate properties from dtb during bl2 setup
fconf: Load config dtb from bl1
fconf: initial commit
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/auth/auth_mod.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/auth/auth_mod.c b/drivers/auth/auth_mod.c index 3fb2d1a48..91ee1bea9 100644 --- a/drivers/auth/auth_mod.c +++ b/drivers/auth/auth_mod.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -16,6 +16,7 @@ #include <drivers/auth/auth_mod.h> #include <drivers/auth/crypto_mod.h> #include <drivers/auth/img_parser_mod.h> +#include <lib/fconf/fconf_tbbr_getter.h> #include <plat/common/platform.h> /* ASN.1 tags */ @@ -302,9 +303,8 @@ int auth_mod_get_parent_id(unsigned int img_id, unsigned int *parent_id) const auth_img_desc_t *img_desc = NULL; assert(parent_id != NULL); - /* Get the image descriptor */ - img_desc = cot_desc_ptr[img_id]; + img_desc = FCONF_GET_PROPERTY(tbbr, cot, img_id); /* Check if the image has no parent (ROT) */ if (img_desc->parent == NULL) { @@ -353,7 +353,7 @@ int auth_mod_verify_img(unsigned int img_id, int rc, i; /* Get the image descriptor from the chain of trust */ - img_desc = cot_desc_ptr[img_id]; + img_desc = FCONF_GET_PROPERTY(tbbr, cot, img_id); /* Ask the parser to check the image integrity */ rc = img_parser_check_integrity(img_desc->img_type, img_ptr, img_len); |