| commit | 0bed7c1f90ba7d3a1770764aa8fb7d4e6afb1664 | [log] [tgz] |
|---|---|---|
| author | danh-arm <dan.handley@arm.com> | Wed Jun 24 19:05:50 2015 +0100 |
| committer | danh-arm <dan.handley@arm.com> | Wed Jun 24 19:05:50 2015 +0100 |
| tree | b6f9e1940ca0f33d3cc0f787f821267c0a0e41e4 | |
| parent | 786414596bf528f72a41da54a6e30d7145749801 [diff] | |
| parent | 4534c64ebe2635ecbf370f61f4f061069bf4b0db [diff] |
Merge pull request #325 from sandrine-bailleux/sb/fix-rw-data-relocation Bug fix: Build time condition to relocate RW data
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__