diff options
author | Joanna Farley <joanna.farley@arm.com> | 2022-03-30 09:38:52 +0200 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2022-03-30 09:38:52 +0200 |
commit | f78cb61a11da3d965be809ebf8b592a8c33f6473 (patch) | |
tree | 2599a9a06e46c0552d1b8ecd05ae374bc2ff5d36 /drivers | |
parent | e24ce2c1c8ff57c9399f3bd76a9130461d3b042d (diff) | |
parent | 5161cfde9bfaa3a715d160fcd4870f276adad332 (diff) | |
download | trusted-firmware-a-f78cb61a11da3d965be809ebf8b592a8c33f6473.tar.gz |
Merge changes I84e257b3,I1317e482 into integration
* changes:
fix(layerscape): fix coverity issue
fix(nxp-ddr): fix coverity issue
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/nxp/ddr/phy-gen2/phy.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/nxp/ddr/phy-gen2/phy.c b/drivers/nxp/ddr/phy-gen2/phy.c index 7dbe3a394f..c8245a846e 100644 --- a/drivers/nxp/ddr/phy-gen2/phy.c +++ b/drivers/nxp/ddr/phy-gen2/phy.c @@ -2216,10 +2216,14 @@ static int load_fw(uint16_t **phy_ptr, size = PHY_GEN2_MAX_IMAGE_SIZE; image_buf = (uintptr_t)phy_gen2_fw_img_buf; - mmap_add_dynamic_region(phy_gen2_fw_img_buf, + ret = mmap_add_dynamic_region(phy_gen2_fw_img_buf, phy_gen2_fw_img_buf, PHY_GEN2_MAX_IMAGE_SIZE, MT_MEMORY | MT_RW | MT_SECURE); + if (ret != 0) { + ERROR("Failed to add dynamic memory region.\n"); + return ret; + } ret = img_loadr(imem_id, &image_buf, &size); if (ret != 0) { ERROR("Failed to load %d firmware.\n", imem_id); |