Merge "fix(intel): assert if bl_mem_params is NULL pointer" into integration

This commit is contained in:
Madhukar Pappireddy 2022-02-28 20:36:30 +01:00 committed by TrustedFirmware Code Review
commit a78c6c9666
2 changed files with 6 additions and 0 deletions

View File

@ -7,6 +7,7 @@
#include <arch.h>
#include <arch_helpers.h>
#include <assert.h>
#include <common/bl_common.h>
#include <common/debug.h>
#include <common/desc_image_load.h>
@ -162,6 +163,8 @@ int bl2_plat_handle_post_image_load(unsigned int image_id)
{
bl_mem_params_node_t *bl_mem_params = get_bl_mem_params_node(image_id);
assert(bl_mem_params);
switch (image_id) {
case BL33_IMAGE_ID:
bl_mem_params->ep_info.args.arg0 = 0xffff & read_mpidr();

View File

@ -7,6 +7,7 @@
#include <arch.h>
#include <arch_helpers.h>
#include <assert.h>
#include <common/bl_common.h>
#include <common/debug.h>
#include <common/desc_image_load.h>
@ -158,6 +159,8 @@ int bl2_plat_handle_post_image_load(unsigned int image_id)
{
bl_mem_params_node_t *bl_mem_params = get_bl_mem_params_node(image_id);
assert(bl_mem_params);
switch (image_id) {
case BL33_IMAGE_ID:
bl_mem_params->ep_info.args.arg0 = 0xffff & read_mpidr();