commit c9915c0b0ff563ca5dedc1a303777b9644ae7f59
author Sandrine Bailleux <sandrine.bailleux@arm.com> Wed Jun 24 15:26:39 2015 +0100
committer Sandrine Bailleux <sandrine.bailleux@arm.com> Wed Jun 24 17:19:26 2015 +0100
tree b6f9e1940ca0f33d3cc0f787f821267c0a0e41e4
parent 5a6954fbfbf17783f7089305fb2d5802be17f934

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

diff --git a/include/common/el3_common_macros.S b/include/common/el3_common_macros.S
index b8a947c..eb033a6 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__