diff options
| -rw-r--r-- | bl1/tbbr/tbbr_img_desc.c | 3 | ||||
| -rw-r--r-- | drivers/auth/crypto_mod.c | 3 | ||||
| -rw-r--r-- | drivers/auth/mbedtls/mbedtls_common.c | 3 | ||||
| -rw-r--r-- | include/drivers/auth/auth_mod.h | 3 | ||||
| -rw-r--r-- | include/drivers/auth/crypto_mod.h | 2 | ||||
| -rw-r--r-- | plat/arm/common/arm_bl1_fwu.c | 7 |
6 files changed, 14 insertions, 7 deletions
diff --git a/bl1/tbbr/tbbr_img_desc.c b/bl1/tbbr/tbbr_img_desc.c index f2ed1a1c..44f58d3f 100644 --- a/bl1/tbbr/tbbr_img_desc.c +++ b/bl1/tbbr/tbbr_img_desc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -7,6 +7,7 @@ #include <bl1.h> #include <bl_common.h> #include <platform_def.h> +#include <tbbr/tbbr_img_desc.h> image_desc_t bl1_tbbr_image_descs[] = { { diff --git a/drivers/auth/crypto_mod.c b/drivers/auth/crypto_mod.c index 3b3e3ac4..4cd05506 100644 --- a/drivers/auth/crypto_mod.c +++ b/drivers/auth/crypto_mod.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -9,7 +9,6 @@ #include <debug.h> /* Variable exported by the crypto library through REGISTER_CRYPTO_LIB() */ -extern const crypto_lib_desc_t crypto_lib_desc; /* * The crypto module is responsible for verifying digital signatures and hashes. diff --git a/drivers/auth/mbedtls/mbedtls_common.c b/drivers/auth/mbedtls/mbedtls_common.c index 205c2432..c048d005 100644 --- a/drivers/auth/mbedtls/mbedtls_common.c +++ b/drivers/auth/mbedtls/mbedtls_common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -10,6 +10,7 @@ #include <mbedtls/memory_buffer_alloc.h> #include <mbedtls/platform.h> #include <mbedtls_config.h> +#include <mbedtls_common.h> /* * mbed TLS heap diff --git a/include/drivers/auth/auth_mod.h b/include/drivers/auth/auth_mod.h index 74fc15fc..bb3b8f90 100644 --- a/include/drivers/auth/auth_mod.h +++ b/include/drivers/auth/auth_mod.h @@ -44,6 +44,9 @@ int auth_mod_verify_img(unsigned int img_id, (const auth_img_desc_t *const)&_cot[0]; \ unsigned int auth_img_flags[MAX_NUMBER_IDS] +extern const auth_img_desc_t *const cot_desc_ptr; +extern unsigned int auth_img_flags[MAX_NUMBER_IDS]; + #endif /* TRUSTED_BOARD_BOOT */ #endif /* __AUTH_MOD_H__ */ diff --git a/include/drivers/auth/crypto_mod.h b/include/drivers/auth/crypto_mod.h index 7a1b6b80..f9b44d1c 100644 --- a/include/drivers/auth/crypto_mod.h +++ b/include/drivers/auth/crypto_mod.h @@ -57,4 +57,6 @@ int crypto_mod_verify_hash(void *data_ptr, unsigned int data_len, .verify_hash = _verify_hash \ } +extern const crypto_lib_desc_t crypto_lib_desc; + #endif /* __CRYPTO_MOD_H__ */ diff --git a/plat/arm/common/arm_bl1_fwu.c b/plat/arm/common/arm_bl1_fwu.c index 1305934c..f2be4779 100644 --- a/plat/arm/common/arm_bl1_fwu.c +++ b/plat/arm/common/arm_bl1_fwu.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -9,6 +9,7 @@ #include <debug.h> #include <errno.h> #include <plat_arm.h> +#include <platform.h> #include <platform_def.h> #include <tbbr_img_desc.h> #include <utils.h> @@ -19,7 +20,7 @@ typedef struct bl1_mem_info { unsigned int mem_size; } bl1_mem_info_t; -bl1_mem_info_t fwu_addr_map_secure[] = { +static bl1_mem_info_t fwu_addr_map_secure[] = { { .mem_base = ARM_SHARED_RAM_BASE, .mem_size = ARM_SHARED_RAM_SIZE @@ -29,7 +30,7 @@ bl1_mem_info_t fwu_addr_map_secure[] = { } }; -bl1_mem_info_t fwu_addr_map_non_secure[] = { +static bl1_mem_info_t fwu_addr_map_non_secure[] = { { .mem_base = ARM_NS_DRAM1_BASE, .mem_size = ARM_NS_DRAM1_SIZE |