Skip to content

Commit afd54b6

Browse files
Vge0rgejoerchan
authored andcommitted
[nrf fromlist] platform: nordic_nrf: Fix assert in initialization
This fixes an erroneous attempt to configure the FPU peripheral in NRF91 series. The FPU is not configurable in NRF91 series and it is always non-secure. This caused a failed assertion in the initialzation since the FPU present field is not set for the SPU configuration. This change configures the FPU only in NRF53 series devices which have a configurable FPU. Ref: NCSDK-23619 Upstream PR: https://review.trustedfirmware.org/c/TF-M/trusted-firmware-m/+/23470 Signed-off-by: Georgios Vasilakis <[email protected]> Change-Id: Ia00e0e620ab51850e6ee8b382e5d03a245b6db0c
1 parent 68ce232 commit afd54b6

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

platform/ext/target/nordic_nrf/common/core/target_cfg.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,10 +744,13 @@ enum tfm_plat_err_t spu_periph_init_cfg(void)
744744
/* Peripheral configuration */
745745

746746
/* The following peripherals share ID:
747-
* - FPU
747+
* - FPU (FPU cannot be configured in NRF91 series, it's always NS)
748748
* - DCNF (On 53, but not 91)
749749
*/
750+
#ifndef NRF91_SERIES
750751
spu_peripheral_config_non_secure((uint32_t)NRF_FPU, false);
752+
#endif
753+
751754
/* The following peripherals share ID:
752755
* - REGULATORS
753756
* - OSCILLATORS

0 commit comments

Comments
 (0)