diff options
author | Feder Liang <Feder.Liang@arm.com> | 2021-09-09 12:50:12 +0800 |
---|---|---|
committer | Ken Liu <ken.liu@arm.com> | 2021-09-18 02:00:08 +0200 |
commit | a04206a06eef51dac0c0486798e3282f09e5e4d9 (patch) | |
tree | 91fda58cb2f9e2ee4eed5b72c41a19534d17888e /secure_fw | |
parent | 5885250399fdd643727e42c5495bcbc69556a4a0 (diff) | |
download | trusted-firmware-m-a04206a06eef51dac0c0486798e3282f09e5e4d9.tar.gz |
SPM: Fix CCR.TRD setting for Armv8.1-M
Current CCR.TRD setting is only valid when __FPU_PRESENT defined, hence
moving the setting to appropriate location.
Change-Id: I70c73f0b6656c1cb85ff8dcd5bdbd37e85a103c9
Signed-off-by: Feder Liang <Feder.Liang@arm.com>
Diffstat (limited to 'secure_fw')
-rw-r--r-- | secure_fw/spm/cmsis_psa/arch/tfm_arch_v8m_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/secure_fw/spm/cmsis_psa/arch/tfm_arch_v8m_main.c b/secure_fw/spm/cmsis_psa/arch/tfm_arch_v8m_main.c index 33fda0c289..2254dba439 100644 --- a/secure_fw/spm/cmsis_psa/arch/tfm_arch_v8m_main.c +++ b/secure_fw/spm/cmsis_psa/arch/tfm_arch_v8m_main.c @@ -251,11 +251,11 @@ void tfm_arch_config_extensions(void) * the NSPE. This configuration is left to NS privileged software. */ SCB->NSACR |= SCB_NSACR_CP10_Msk | SCB_NSACR_CP11_Msk; +#endif #if defined(__ARM_ARCH_8_1M_MAIN__) SCB->CCR |= SCB_CCR_TRD_Msk; #endif -#endif } __attribute__((naked, noinline)) void tfm_arch_clear_fp_status(void) |