diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2018-02-07 11:57:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-07 11:57:19 +0800 |
| commit | 5b75b4a725d062bd593856a665bfda0e1b23a04b (patch) | |
| tree | afc86aa95f7073042803ed9f5938020d19ecb369 /plat/qemu/qemu_common.c | |
| parent | 9fd2f13bd608832260300640970f73c62357c684 (diff) | |
| parent | 95ae5b00447da02695a653004b86e6b805e058a9 (diff) | |
| download | platform_external_arm-trusted-firmware-5b75b4a725d062bd593856a665bfda0e1b23a04b.tar.gz platform_external_arm-trusted-firmware-5b75b4a725d062bd593856a665bfda0e1b23a04b.tar.bz2 platform_external_arm-trusted-firmware-5b75b4a725d062bd593856a665bfda0e1b23a04b.zip | |
Merge pull request #1173 from etienne-lms/armv7-qemu
support to boot OP-TEE on AArch32/Armv7+example with Cortex-A15/Qemu
Diffstat (limited to 'plat/qemu/qemu_common.c')
| -rw-r--r-- | plat/qemu/qemu_common.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/plat/qemu/qemu_common.c b/plat/qemu/qemu_common.c index e34b16fe7..6f9fcc60a 100644 --- a/plat/qemu/qemu_common.c +++ b/plat/qemu/qemu_common.c @@ -85,6 +85,16 @@ static const mmap_region_t plat_qemu_mmap[] = { {0} }; #endif +#ifdef IMAGE_BL32 +static const mmap_region_t plat_qemu_mmap[] = { + MAP_SHARED_RAM, + MAP_DEVICE0, +#ifdef MAP_DEVICE1 + MAP_DEVICE1, +#endif + {0} +}; +#endif /******************************************************************************* * Macro generating the code for the function setting up the pagetables as per @@ -92,7 +102,7 @@ static const mmap_region_t plat_qemu_mmap[] = { ******************************************************************************/ #define DEFINE_CONFIGURE_MMU_EL(_el) \ - void qemu_configure_mmu_el##_el(unsigned long total_base, \ + void qemu_configure_mmu_##_el(unsigned long total_base, \ unsigned long total_size, \ unsigned long ro_start, \ unsigned long ro_limit, \ @@ -111,11 +121,15 @@ static const mmap_region_t plat_qemu_mmap[] = { mmap_add(plat_qemu_mmap); \ init_xlat_tables(); \ \ - enable_mmu_el##_el(0); \ + enable_mmu_##_el(0); \ } /* Define EL1 and EL3 variants of the function initialising the MMU */ -DEFINE_CONFIGURE_MMU_EL(1) -DEFINE_CONFIGURE_MMU_EL(3) +#ifdef AARCH32 +DEFINE_CONFIGURE_MMU_EL(secure) +#else +DEFINE_CONFIGURE_MMU_EL(el1) +DEFINE_CONFIGURE_MMU_EL(el3) +#endif |