aboutsummaryrefslogtreecommitdiff
path: root/plat
diff options
context:
space:
mode:
authordanh-arm <dan.handley@arm.com>2014-05-08 11:55:19 +0100
committerdanh-arm <dan.handley@arm.com>2014-05-08 11:55:19 +0100
commita1ec2f4c9aa089fe938b8d233ebd18c389cbad78 (patch)
treeab44e6424155c835cf974b8ba8088dd83ebe6e47 /plat
parentb3e2268eeb5881c82d0c930d2d61748bffd57f05 (diff)
parent2f5dcfef1db42f3b073ae657f8a94925abecd768 (diff)
downloadarm-trusted-firmware-a1ec2f4c9aa089fe938b8d233ebd18c389cbad78.tar.gz
Merge pull request #60 from athoelke/disable-mmu-v2
Replace disable_mmu with assembler version v2
Diffstat (limited to 'plat')
-rw-r--r--plat/fvp/aarch64/plat_common.c23
-rw-r--r--plat/fvp/platform.h1
2 files changed, 0 insertions, 24 deletions
diff --git a/plat/fvp/aarch64/plat_common.c b/plat/fvp/aarch64/plat_common.c
index e2f2343..edeb6e0 100644
--- a/plat/fvp/aarch64/plat_common.c
+++ b/plat/fvp/aarch64/plat_common.c
@@ -118,29 +118,6 @@ void enable_mmu()
return;
}
-void disable_mmu(void)
-{
- unsigned long sctlr;
- unsigned long current_el = read_current_el();
-
- if (GET_EL(current_el) == MODE_EL3) {
- sctlr = read_sctlr_el3();
- sctlr = sctlr & ~(SCTLR_M_BIT | SCTLR_C_BIT);
- write_sctlr_el3(sctlr);
- } else {
- sctlr = read_sctlr_el1();
- sctlr = sctlr & ~(SCTLR_M_BIT | SCTLR_C_BIT);
- write_sctlr_el1(sctlr);
- }
- /* ensure the MMU disable takes effect immediately */
- isb();
-
- /* Flush the caches */
- dcsw_op_all(DCCISW);
-
- return;
-}
-
/*
* Table of regions to map using the MMU.
* This doesn't include TZRAM as the 'mem_layout' argument passed to to
diff --git a/plat/fvp/platform.h b/plat/fvp/platform.h
index 06bda79..3fe892e 100644
--- a/plat/fvp/platform.h
+++ b/plat/fvp/platform.h
@@ -370,7 +370,6 @@ extern void bl2_plat_arch_setup(void);
extern void bl31_plat_arch_setup(void);
extern int platform_setup_pm(const struct plat_pm_ops **);
extern unsigned int platform_get_core_pos(unsigned long mpidr);
-extern void disable_mmu(void);
extern void enable_mmu(void);
extern void configure_mmu(struct meminfo *,
unsigned long,