From c9915c0b0ff563ca5dedc1a303777b9644ae7f59 Mon Sep 17 00:00:00 2001 From: Sandrine Bailleux Date: Wed, 24 Jun 2015 15:26:39 +0100 Subject: [PATCH] Bug fix: Build time condition to relocate RW data This patch fixes the build time condition deciding whether the read-write data should be relocated from ROM to RAM. It was incorrectly using __DATA_ROM_START__, which is a linker symbol and not a compiler build flag. As a result, the relocation code was always compiled out. This bug has been introduced by the following patch: "Rationalize reset handling code" Change-Id: I1c8d49de32f791551ab4ac832bd45101d6934045 --- include/common/el3_common_macros.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/common/el3_common_macros.S b/include/common/el3_common_macros.S index b8a947cf3..eb033a6e6 100644 --- a/include/common/el3_common_macros.S +++ b/include/common/el3_common_macros.S @@ -226,7 +226,7 @@ bl zeromem16 #endif -#ifdef __DATA_ROM_START__ +#if IMAGE_BL1 ldr x0, =__DATA_RAM_START__ ldr x1, =__DATA_ROM_START__ ldr x2, =__DATA_SIZE__