Matter Thermostat build fail for nRF54L15DK

I'm using NCS SDK v3.0.2 and trying to build the Matter Thermostat example for the target: ` nrf54L15DK/nrf54L15/cpuapp/ns`
However, the build fails with the following errors originating from the NFC platform source file:

In function 'nfc_platform_tagheaders_get':
/nrf/subsys/nfc/lib/platform.c:149:9: error: unknown type name 'FICR_NFC_Type'; did you mean 'NRF_FICR_NFC_Type'?
  FICR_NFC_Type ficr_nfc_ns;
                ^~~~~~~~~~~~~
                NRF_FICR_NFC_Type

/nrf/subsys/nfc/lib/platform.c:150:15: error: unknown type name 'FICR_NFC_Type'
  __IOM FICR_NFC_Type *ficr_nfc = &NRF_FICR_S->NFC;

/nrf/subsys/nfc/lib/platform.c:150:42: error: 'NRF_FICR_S' undeclared (first use in this function); did you mean 'NRF_UICR_S'?
  __IOM FICR_NFC_Type *ficr_nfc = &NRF_FICR_S->NFC;
                                     ^~~~~~~~~~
                                     NRF_UICR_S

/nrf/subsys/nfc/lib/platform.c:160:36: error: request for member 'TAGHEADER0' in something not a structure or union
  tag_header[0] = ficr_nfc_ns.TAGHEADER0;

/nrf/subsys/nfc/lib/platform.c:161:36: error: request for member 'TAGHEADER1' in something not a structure or union
  tag_header[1] = ficr_nfc_ns.TAGHEADER1;

/nrf/subsys/nfc/lib/platform.c:162:36: error: request for member 'TAGHEADER2' in something not a structure or union
  tag_header[2] = ficr_nfc_ns.TAGHEADER2;

Given this, do I need to modify the SDK source file at:
/nrf/subsys/nfc/lib/platform.c
to fix the usage of FICR_NFC_Type, and possibly replace it with NRF_FICR_NFC_Type to ensure compatibility with the nrf54L15 target?

Related