diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2018-11-01 10:18:39 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-11-02 07:24:15 +0100 |
| commit | 3c2b8f3ef0832ec6da320e70c44af62401d216d7 (patch) | |
| tree | 39e843c2fa580bb21b2421442b03ccaad264637a /arch | |
| parent | 41292192c01bc17b7c53642d66e434ce24eb3f25 (diff) | |
| download | barebox-3c2b8f3ef0832ec6da320e70c44af62401d216d7.tar.gz barebox-3c2b8f3ef0832ec6da320e70c44af62401d216d7.tar.xz | |
ARM: allow secure monitor code to be built without PSCI
The hyp mode handling added in the secure monitor code is also useful
when Barebox doesn't have PSCI control. Allow to build without PSCI.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Tested-by: Roland Hieber <r.hieber@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/sm_as.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/cpu/sm_as.S b/arch/arm/cpu/sm_as.S index 09580e75de..0d01e1bf24 100644 --- a/arch/arm/cpu/sm_as.S +++ b/arch/arm/cpu/sm_as.S @@ -129,7 +129,9 @@ secure_monitor: sub sp, sp, #4*4 @ allocate result structure on stack mov r12, sp push {r4-r6, r12} +#ifdef CONFIG_ARM_PSCI bl psci_entry +#endif pop {r4-r6, r12} ldm r12, {r0-r3} add sp, sp, #4*4 @@ -163,6 +165,8 @@ ENTRY(psci_cpu_entry) mcr p15, 0, r0, c1, c0, 1 @ ACTLR bl secure_monitor_stack_setup +#ifdef CONFIG_ARM_PSCI bl psci_cpu_entry_c +#endif ENDPROC(psci_cpu_entry) |