aboutsummaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorIoannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>2021-04-19 11:16:52 +0200
committerAnton Komlev <Anton.Komlev@arm.com>2021-04-19 22:57:36 +0200
commit00876efad479b3b2df5d4f3fa666c2d9e675e99d (patch)
tree5630de7bc7a3f119647441a541bc4be66d646620 /platform
parent4aa5a400f7f642766398c4c700aca6fde7bc9e15 (diff)
downloadtrusted-firmware-m-00876efad479b3b2df5d4f3fa666c2d9e675e99d.tar.gz
platform: nordic_nrf: remove setting the NSACR in platform code
Remove setting NCACR in Nordic nRF platform system initialization code (allowing non-secure access to the floating point co-processor). This setting is not required here, as the NSACR register setting is also applied in TF-M arch initialization code (tfm_arch_config_extensions), in a cross-platform fashion. Change-Id: Ibaeb13c54443634594a91a24260c94eb9d106ef0 Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
Diffstat (limited to 'platform')
-rw-r--r--platform/ext/target/nordic_nrf/common/core/nrfx/mdk/system_nrf5340_application.c4
-rw-r--r--platform/ext/target/nordic_nrf/common/core/nrfx/mdk/system_nrf9160.c3
2 files changed, 0 insertions, 7 deletions
diff --git a/platform/ext/target/nordic_nrf/common/core/nrfx/mdk/system_nrf5340_application.c b/platform/ext/target/nordic_nrf/common/core/nrfx/mdk/system_nrf5340_application.c
index 1f45282f8..fb0b41ad1 100644
--- a/platform/ext/target/nordic_nrf/common/core/nrfx/mdk/system_nrf5340_application.c
+++ b/platform/ext/target/nordic_nrf/common/core/nrfx/mdk/system_nrf5340_application.c
@@ -226,10 +226,6 @@ void SystemInit(void)
#endif
- /* Allow Non-Secure code to run FPU instructions.
- * If only the secure code should control FPU power state these registers should be configured accordingly in the secure application code. */
- SCB->NSACR |= (3UL << 10);
-
/* Handle fw-branch APPROTECT setup. */
nrf53_handle_approtect();
diff --git a/platform/ext/target/nordic_nrf/common/core/nrfx/mdk/system_nrf9160.c b/platform/ext/target/nordic_nrf/common/core/nrfx/mdk/system_nrf9160.c
index 47b198039..2fc3274ec 100644
--- a/platform/ext/target/nordic_nrf/common/core/nrfx/mdk/system_nrf9160.c
+++ b/platform/ext/target/nordic_nrf/common/core/nrfx/mdk/system_nrf9160.c
@@ -218,9 +218,6 @@ void SystemInit(void)
*/
#endif
- /* Allow Non-Secure code to run FPU instructions.
- * If only the secure code should control FPU power state these registers should be configured accordingly in the secure application code. */
- SCB->NSACR |= (3UL << 10);
#endif
/* Enable the FPU if the compiler used floating point unit instructions. __FPU_USED is a MACRO defined by the