diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2017-07-05 15:07:05 +0100 |
|---|---|---|
| committer | Soby Mathew <soby.mathew@arm.com> | 2017-09-06 15:32:20 +0100 |
| commit | ba6c31da59e86ba81fe0b846a9be1cb470c5e9f7 (patch) | |
| tree | 38c26c00db0b7f180db1322c97fb653e062bf30f /include/plat | |
| parent | 942ee0d8cf936387c5e7891237e5fb0d58d7d250 (diff) | |
Fix JUNO AArch32 build
This patch fixes the inconsistency with regards as to how
BL2_BASE/BL2U_BASE and BL2_LIMIT/BL2U_LIMIT macros are defined
when building Juno to run in AArch32 mode at EL3. In this case,
BL32 is compiled for AArch32 whereas BL1 and BL2 are compiled
for AArch64. This resulted in BL32 conditionally compiling a
different definition of the above mentioned macros from BL1/BL2.
This is fixed by taking into consideration the
JUNO_AARCH32_EL3_RUNTIME build flag as well in the conditional
compilation check.
Change-Id: I27ac68aa4df0502089c1739c05366a9c509eb5be
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
Diffstat (limited to 'include/plat')
| -rw-r--r-- | include/plat/arm/common/arm_def.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index 2b0d894e..efc276c6 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -266,7 +266,7 @@ /******************************************************************************* * BL2 specific defines. ******************************************************************************/ -#if ARM_BL31_IN_DRAM || defined(AARCH32) +#if ARM_BL31_IN_DRAM || (defined(AARCH32) && !defined(JUNO_AARCH32_EL3_RUNTIME)) /* * For AArch32 BL31 is not applicable. * For AArch64 BL31 is loaded in the DRAM. @@ -353,7 +353,7 @@ * FWU Images: NS_BL1U, BL2U & NS_BL2U defines. ******************************************************************************/ #define BL2U_BASE BL2_BASE -#if ARM_BL31_IN_DRAM || defined(AARCH32) +#if ARM_BL31_IN_DRAM || (defined(AARCH32) && !defined(JUNO_AARCH32_EL3_RUNTIME)) /* * For AArch32 BL31 is not applicable. * For AArch64 BL31 is loaded in the DRAM. |