summaryrefslogtreecommitdiff
path: root/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2016-07-15 18:55:43 +0100
committerGitHub <noreply@github.com>2016-07-15 18:55:43 +0100
commitaadb1350eed3c18aec6cd999519cef55d93678b3 (patch)
treed851cbd6afa9f9b14676cde93bbf4e49f0cfebf1 /plat/xilinx/zynqmp/tsp/tsp_plat_setup.c
parent9306f135922bc7811dfc1e24a755c38ce2e671cd (diff)
parent91fad6551ee3e5529f9b442cd4a084251cdebe1d (diff)
Merge pull request #662 from sandrine-bailleux-arm/sb/rodata-xn
Map read-only data as execute-never
Diffstat (limited to 'plat/xilinx/zynqmp/tsp/tsp_plat_setup.c')
-rw-r--r--plat/xilinx/zynqmp/tsp/tsp_plat_setup.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c b/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c
index 58a3e2a1..ae66fa41 100644
--- a/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c
+++ b/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -90,13 +90,16 @@ void tsp_platform_setup(void)
******************************************************************************/
void tsp_plat_arch_setup(void)
{
- arm_configure_mmu_el1(BL32_RO_BASE,
+ arm_setup_page_tables(BL32_RO_BASE,
(BL32_END - BL32_RO_BASE),
BL32_RO_BASE,
- BL32_RO_LIMIT
+ BL32_RO_LIMIT,
+ 0,
+ 0
#if USE_COHERENT_MEM
, BL32_COHERENT_RAM_BASE,
BL32_COHERENT_RAM_LIMIT
#endif
);
+ enable_mmu_el1(0);
}