modules: trusted-firmware-m: Update config used in set NFCT pins as GPIOS

Add support for NFCT pins as GPIOS for /ns targets
to 54L series.
Update NFCT pins config to use the same config on all devices.

Signed-off-by: Dag Erik Gjørvad <[email protected]>

Author: degjorva

modules/trusted-firmware-m/CMakeLists.txt

@@ -144,7 +144,7 @@ endif()
 if(CONFIG_NFCT_PINS_AS_GPIOS OR CONFIG_TFM_NFCT_PINS_AS_GPIOS)
   set_property(TARGET zephyr_property_target
     APPEND PROPERTY TFM_CMAKE_OPTIONS
-    -DCONFIG_NFCT_PINS_AS_GPIOS=ON
+    -DNRF_CONFIG_NFCT_PINS_AS_GPIOS=ON
   )
 endif()
 

modules/trusted-firmware-m/Kconfig

@@ -350,7 +350,7 @@ config TFM_CPU_FREQ_MHZ
 config TFM_NFCT_PINS_AS_GPIOS
 	bool
 	default y if !DT_HAS_NORDIC_NRF_NFCT_ENABLED
-	depends on SOC_NRF5340_CPUAPP
+	depends on SOC_NRF5340_CPUAPP || SOC_SERIES_NRF54LX
 	help
 	  Two pins are usually reserved for NFC in SoCs that implement the
 	  NFCT peripheral. This option switches them to normal GPIO mode.
@@ -360,6 +360,8 @@ config TFM_NFCT_PINS_AS_GPIOS
 	  flashing device using the image which has this option disabled.
 
 	  NFC pins in nRF5340: P0.02 and P0.03
+	  NFC pins in nRF54L15/10/05: P1.02 and P1.03
+	  NFC pins in nRF54LM20A: P1.01 and P1.02
 
 	  TF-M configures these pins as GPIOS when the NFCT peripheral is not
 	  enabled in the device-tree of the target.

modules/trusted-firmware-m/tfm_boards/CMakeLists.txt

@@ -144,8 +144,8 @@ if (NRF_ALLOW_NON_SECURE_FAULT_HANDLING)
   )
 endif()
 
-if (CONFIG_NFCT_PINS_AS_GPIOS)
-  target_compile_definitions(platform_s PUBLIC CONFIG_NFCT_PINS_AS_GPIOS)
+if(NRF_CONFIG_NFCT_PINS_AS_GPIOS)
+  target_compile_definitions(platform_s PUBLIC NRF_CONFIG_NFCT_PINS_AS_GPIOS)
 endif()
 
 if (TFM_CPU_FREQ_MHZ)