diff options
| author | danh-arm <dan.handley@arm.com> | 2017-05-22 15:28:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-22 15:28:17 +0100 |
| commit | 81602a9791421d362494386805bc65d9590fd92e (patch) | |
| tree | ad8f302c05e1890d9b6bb19631e9052368c15a6d /plat/arm | |
| parent | ac7b0da6c5a8a7cd0d584a1270850e5b84ebfb4e (diff) | |
| parent | 6ba71d65ac37696f837c9df78a41334ff576e2da (diff) | |
Merge pull request #939 from dp-arm/dp/AArch32_tbbr
Add TBBR and FWU support for AArch32
Diffstat (limited to 'plat/arm')
| -rw-r--r-- | plat/arm/board/fvp/platform.mk | 4 | ||||
| -rw-r--r-- | plat/arm/common/arm_bl2u_setup.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk index afcb4b53..6a759c5a 100644 --- a/plat/arm/board/fvp/platform.mk +++ b/plat/arm/board/fvp/platform.mk @@ -137,5 +137,9 @@ ifneq (${ENABLE_STACK_PROTECTOR},0) PLAT_BL_COMMON_SOURCES += plat/arm/board/fvp/fvp_stack_protector.c endif +ifeq (${ARCH},aarch32) + NEED_BL32 := yes +endif + include plat/arm/board/common/board_common.mk include plat/arm/common/arm_common.mk diff --git a/plat/arm/common/arm_bl2u_setup.c b/plat/arm/common/arm_bl2u_setup.c index d09a00dc..5dc9eea0 100644 --- a/plat/arm/common/arm_bl2u_setup.c +++ b/plat/arm/common/arm_bl2u_setup.c @@ -68,7 +68,11 @@ void arm_bl2u_plat_arch_setup(void) BL_COHERENT_RAM_END #endif ); +#ifdef AARCH32 + enable_mmu_secure(0); +#else enable_mmu_el1(0); +#endif } void bl2u_plat_arch_setup(void) |