summaryrefslogtreecommitdiff
path: root/plat/qemu/qemu_bl31_setup.c
diff options
context:
space:
mode:
authordavidcunado-arm <david.cunado@arm.com>2018-03-05 10:52:41 +0000
committerGitHub <noreply@github.com>2018-03-05 10:52:41 +0000
commiteb4ff4c10e970b86fd4129a474fa9762136b6127 (patch)
treedc929e103fc90bb82e8a920ecbe631d953e6751f /plat/qemu/qemu_bl31_setup.c
parentdb0a68fda72dc5cf0e3976d8d0f61c7be62ba1c2 (diff)
parent27e0ccabe75e39405e904ee953f37c3ecbc265a3 (diff)
Merge pull request #1288 from michpappas/tf-issues#558_qemu_separate_code_and_data
qemu: Support SEPARATE_CODE_AND_RODATA
Diffstat (limited to 'plat/qemu/qemu_bl31_setup.c')
-rw-r--r--plat/qemu/qemu_bl31_setup.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/plat/qemu/qemu_bl31_setup.c b/plat/qemu/qemu_bl31_setup.c
index f79a8854..6ded9295 100644
--- a/plat/qemu/qemu_bl31_setup.c
+++ b/plat/qemu/qemu_bl31_setup.c
@@ -19,8 +19,6 @@
* script to ensure that __RO_START__, __RO_END__ & __BL31_END__ linker symbols
* refer to page-aligned addresses.
*/
-#define BL31_RO_BASE (unsigned long)(&__RO_START__)
-#define BL31_RO_LIMIT (unsigned long)(&__RO_END__)
#define BL31_END (unsigned long)(&__BL31_END__)
/*
@@ -108,8 +106,9 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2,
void bl31_plat_arch_setup(void)
{
- qemu_configure_mmu_el3(BL31_RO_BASE, (BL31_END - BL31_RO_BASE),
- BL31_RO_BASE, BL31_RO_LIMIT,
+ qemu_configure_mmu_el3(BL31_BASE, (BL31_END - BL31_BASE),
+ BL_CODE_BASE, BL_CODE_END,
+ BL_RO_DATA_BASE, BL_RO_DATA_END,
BL_COHERENT_RAM_BASE, BL_COHERENT_RAM_END);
}