diff options
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/fvp/aarch64/fvp_common.c | 3 | ||||
| -rw-r--r-- | plat/fvp/bl31_fvp_setup.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/plat/fvp/aarch64/fvp_common.c b/plat/fvp/aarch64/fvp_common.c index 39262397..d22fd556 100644 --- a/plat/fvp/aarch64/fvp_common.c +++ b/plat/fvp/aarch64/fvp_common.c @@ -237,7 +237,8 @@ uint64_t plat_get_syscnt_freq(void) counter_base_frequency = mmio_read_32(SYS_CNTCTL_BASE + CNTFID_OFF); /* The first entry of the frequency modes table must not be 0 */ - assert(counter_base_frequency != 0); + if (counter_base_frequency == 0) + panic(); return counter_base_frequency; } diff --git a/plat/fvp/bl31_fvp_setup.c b/plat/fvp/bl31_fvp_setup.c index ca72aa98..21fca70b 100644 --- a/plat/fvp/bl31_fvp_setup.c +++ b/plat/fvp/bl31_fvp_setup.c @@ -92,7 +92,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) { #if RESET_TO_BL31 - assert(type <= NON_SECURE); + assert(sec_state_is_valid(type)); SET_PARAM_HEAD(&next_image_ep_info, PARAM_EP, VERSION_1, @@ -116,6 +116,8 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) #else entry_point_info_t *next_image_info; + assert(sec_state_is_valid(type)); + next_image_info = (type == NON_SECURE) ? bl2_to_bl31_params->bl33_ep_info : bl2_to_bl31_params->bl32_ep_info; |