From d2ece8dba2f31091b1fa6c302d4255495bb15705 Mon Sep 17 00:00:00 2001 From: Toshiyuki Ogasahara Date: Mon, 12 Jul 2021 19:34:34 +0900 Subject: [PATCH] fix(plat/rcar): fix to load image when option BL2_DCACHE_ENABLE is enabled - Modify load destination variable of the Cert Header to static. - Modify the return value to error (IO_FAIL) when failed to check the Cert Header. Signed-off-by: Koichi Yamaguchi Signed-off-by: Toshiyuki Ogasahara Signed-off-by: Yoshifumi Hosoya Change-Id: Ief09a841ec8d2ae236de82d04855e6a47cfb43f0 --- drivers/renesas/common/io/io_rcar.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/renesas/common/io/io_rcar.c b/drivers/renesas/common/io/io_rcar.c index 17d7aaa29..fa7b958e0 100644 --- a/drivers/renesas/common/io/io_rcar.c +++ b/drivers/renesas/common/io/io_rcar.c @@ -380,7 +380,7 @@ static int32_t load_bl33x(void) static int32_t rcar_dev_init(io_dev_info_t *dev_info, const uintptr_t name) { - uint64_t header[64] __aligned(FLASH_TRANS_SIZE_UNIT) = {0UL}; + static uint64_t header[64] __aligned(FLASH_TRANS_SIZE_UNIT) = {0UL}; uintptr_t handle; ssize_t offset; uint32_t i; @@ -440,6 +440,7 @@ static int32_t rcar_dev_init(io_dev_info_t *dev_info, const uintptr_t name) if (rcar_image_number == 0 || rcar_image_number > RCAR_MAX_BL3X_IMAGE) { WARN("Firmware Image Package header check failed.\n"); + rc = IO_FAIL; goto error; }