diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-04-21 11:45:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-21 11:45:53 +0100 |
| commit | e83b5fdc7a01c137fe77787cc076594ef0850f9e (patch) | |
| tree | eb9ca88682f9ef7a679d24ca051458916f9f6ddd /lib | |
| parent | 228bfabaf874fd8eedd50b0757e34166afb4bf5a (diff) | |
| parent | bcc3c49c90a1e79befa72b8871d4d4c6031c15b7 (diff) | |
| download | arm-trusted-firmware-e83b5fdc7a01c137fe77787cc076594ef0850f9e.tar.gz | |
Merge pull request #898 from soby-mathew/sm/dcache-early
PSCI: Build option to enable D-Caches early in warmboot
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/psci/psci_on.c | 2 | ||||
| -rw-r--r-- | lib/psci/psci_suspend.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/psci/psci_on.c b/lib/psci/psci_on.c index 675ed6681..76e67a362 100644 --- a/lib/psci/psci_on.c +++ b/lib/psci/psci_on.c @@ -165,7 +165,7 @@ void psci_cpu_on_finish(unsigned int cpu_idx, */ psci_plat_pm_ops->pwr_domain_on_finish(state_info); -#if !HW_ASSISTED_COHERENCY +#if !(HW_ASSISTED_COHERENCY || WARMBOOT_ENABLE_DCACHE_EARLY) /* * Arch. management: Enable data cache and manage stack memory */ diff --git a/lib/psci/psci_suspend.c b/lib/psci/psci_suspend.c index 08c8fd6a6..bf95df247 100644 --- a/lib/psci/psci_suspend.c +++ b/lib/psci/psci_suspend.c @@ -302,7 +302,7 @@ void psci_cpu_suspend_finish(unsigned int cpu_idx, */ psci_plat_pm_ops->pwr_domain_suspend_finish(state_info); -#if !HW_ASSISTED_COHERENCY +#if !(HW_ASSISTED_COHERENCY || WARMBOOT_ENABLE_DCACHE_EARLY) /* Arch. management: Enable the data cache, stack memory maintenance. */ psci_do_pwrup_cache_maintenance(); #endif |