diff options
Diffstat (limited to 'include/drivers')
-rw-r--r-- | include/drivers/arm/gicv3.h | 1 | ||||
-rw-r--r-- | include/drivers/auth/auth_mod.h | 14 | ||||
-rw-r--r-- | include/drivers/auth/mbedtls/mbedtls_config.h | 9 | ||||
-rw-r--r-- | include/drivers/marvell/ccu.h | 1 | ||||
-rw-r--r-- | include/drivers/measured_boot/event_log.h | 2 | ||||
-rw-r--r-- | include/drivers/raw_nand.h | 2 | ||||
-rw-r--r-- | include/drivers/st/etzpc.h | 3 |
7 files changed, 27 insertions, 5 deletions
diff --git a/include/drivers/arm/gicv3.h b/include/drivers/arm/gicv3.h index 18d5b73e2f..d8ac4cb334 100644 --- a/include/drivers/arm/gicv3.h +++ b/include/drivers/arm/gicv3.h @@ -488,6 +488,7 @@ void gicv3_distif_init(void); void gicv3_rdistif_init(unsigned int proc_num); void gicv3_rdistif_on(unsigned int proc_num); void gicv3_rdistif_off(unsigned int proc_num); +unsigned int gicv3_rdistif_get_number_frames(const uintptr_t gicr_frame); void gicv3_cpuif_enable(unsigned int proc_num); void gicv3_cpuif_disable(unsigned int proc_num); unsigned int gicv3_get_pending_interrupt_type(void); diff --git a/include/drivers/auth/auth_mod.h b/include/drivers/auth/auth_mod.h index 3965b58e79..d1fd52c868 100644 --- a/include/drivers/auth/auth_mod.h +++ b/include/drivers/auth/auth_mod.h @@ -21,7 +21,18 @@ */ #define IMG_FLAG_AUTHENTICATED (1 << 0) - +#if COT_DESC_IN_DTB && !IMAGE_BL1 +/* + * Authentication image descriptor + */ +typedef struct auth_img_desc_s { + unsigned int img_id; + img_type_t img_type; + const struct auth_img_desc_s *parent; + auth_method_desc_t *img_auth_methods; + auth_param_desc_t *authenticated_data; +} auth_img_desc_t; +#else /* * Authentication image descriptor */ @@ -32,6 +43,7 @@ typedef struct auth_img_desc_s { const auth_method_desc_t *const img_auth_methods; const auth_param_desc_t *const authenticated_data; } auth_img_desc_t; +#endif /* COT_DESC_IN_DTB && !IMAGE_BL1 */ /* Public functions */ void auth_mod_init(void); diff --git a/include/drivers/auth/mbedtls/mbedtls_config.h b/include/drivers/auth/mbedtls/mbedtls_config.h index dc00da7d60..ad39fa9067 100644 --- a/include/drivers/auth/mbedtls/mbedtls_config.h +++ b/include/drivers/auth/mbedtls/mbedtls_config.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2020, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -63,6 +63,7 @@ #define MBEDTLS_ECDSA_C #define MBEDTLS_ECP_C #define MBEDTLS_ECP_DP_SECP256R1_ENABLED +#define MBEDTLS_ECP_NO_INTERNAL_RNG #endif #if TF_MBEDTLS_USE_RSA #define MBEDTLS_RSA_C @@ -101,6 +102,12 @@ /* Memory buffer allocator options */ #define MBEDTLS_MEMORY_ALIGN_MULTIPLE 8 +/* + * Prevent the use of 128-bit division which + * creates dependency on external libraries. + */ +#define MBEDTLS_NO_UDBL_DIVISION + #ifndef __ASSEMBLER__ /* System headers required to build mbed TLS with the current configuration */ #include <stdlib.h> diff --git a/include/drivers/marvell/ccu.h b/include/drivers/marvell/ccu.h index 413ffb972f..f8f0adf676 100644 --- a/include/drivers/marvell/ccu.h +++ b/include/drivers/marvell/ccu.h @@ -47,6 +47,7 @@ void ccu_dram_target_set(int ap_index, uint32_t target); void ccu_save_win_all(int ap_id); void ccu_restore_win_all(int ap_id); int ccu_is_win_enabled(int ap_index, uint32_t win_id); +void errata_wa_init(void); #endif #endif /* CCU_H */ diff --git a/include/drivers/measured_boot/event_log.h b/include/drivers/measured_boot/event_log.h index 10dfbb39dd..efde117626 100644 --- a/include/drivers/measured_boot/event_log.h +++ b/include/drivers/measured_boot/event_log.h @@ -20,8 +20,6 @@ * LOG_LEVEL_WARNING * LOG_LEVEL_VERBOSE */ -#define EVENT_LOG_LEVEL LOG_LEVEL_INFO - #if EVENT_LOG_LEVEL == LOG_LEVEL_ERROR #define LOG_EVENT ERROR #elif EVENT_LOG_LEVEL == LOG_LEVEL_NOTICE diff --git a/include/drivers/raw_nand.h b/include/drivers/raw_nand.h index 9018f02428..7152300945 100644 --- a/include/drivers/raw_nand.h +++ b/include/drivers/raw_nand.h @@ -169,7 +169,7 @@ struct rawnand_device { }; int nand_raw_init(unsigned long long *size, unsigned int *erase_size); -int nand_wait_ready(unsigned long delay); +int nand_wait_ready(unsigned int delay_ms); int nand_read_page_cmd(unsigned int page, unsigned int offset, uintptr_t buffer, unsigned int len); int nand_change_read_column_cmd(unsigned int offset, uintptr_t buffer, diff --git a/include/drivers/st/etzpc.h b/include/drivers/st/etzpc.h index 6e3fec1ea7..4cd2b4e0bb 100644 --- a/include/drivers/st/etzpc.h +++ b/include/drivers/st/etzpc.h @@ -7,6 +7,9 @@ #ifndef DRIVERS_ST_ETZPC_H #define DRIVERS_ST_ETZPC_H +#include <stdbool.h> +#include <stdint.h> + /* Define security level for each peripheral (DECPROT) */ enum etzpc_decprot_attributes { ETZPC_DECPROT_S_RW = 0, |