From 974a751ba45f66fd43e9d05e5157c54f40b80581 Mon Sep 17 00:00:00 2001 From: Maciej Baczmanski Date: Tue, 5 Nov 2024 13:49:37 +0100 Subject: [PATCH] samples: matter: fix fprotect for mcuboot Disable `FPROTECT` in app and reenable it in mcuboot for nrf54l15 Signed-off-by: Maciej Baczmanski --- .../sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 5 ----- .../sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf | 5 ----- .../sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 5 ----- .../sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf | 5 ----- .../sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 5 ----- .../sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf | 5 ----- .../sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 5 ----- .../mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf | 4 ---- .../sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf | 5 ----- .../sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 5 ----- .../sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf | 5 ----- .../sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf | 5 ----- .../sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf | 5 ----- west.yml | 2 +- 14 files changed, 1 insertion(+), 65 deletions(-) diff --git a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 0a20cbbde373..52300bdd681b 100644 --- a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -16,11 +16,6 @@ CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -# TODO: NCSDK-28931: Cannot use fprotect twice, so disable it in MCUboot to -# test protecting Matter factory data. It can be enabled while there is a support -# for protection more than one region. -CONFIG_FPROTECT=n - # required by SPI driver CONFIG_MULTITHREADING=y diff --git a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf index 0a20cbbde373..52300bdd681b 100644 --- a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf +++ b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf @@ -16,11 +16,6 @@ CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -# TODO: NCSDK-28931: Cannot use fprotect twice, so disable it in MCUboot to -# test protecting Matter factory data. It can be enabled while there is a support -# for protection more than one region. -CONFIG_FPROTECT=n - # required by SPI driver CONFIG_MULTITHREADING=y diff --git a/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf index b61eab093c54..c0915991a16b 100644 --- a/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -16,11 +16,6 @@ CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -# TODO: NCSDK-28931: Cannot use fprotect twice, so disable it in MCUboot to -# test protecting Matter factory data. It can be enabled while there is a support -# for protection more than one region. -CONFIG_FPROTECT=n - # required by SPI driver CONFIG_MULTITHREADING=y diff --git a/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf index 0a20cbbde373..52300bdd681b 100644 --- a/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf +++ b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf @@ -16,11 +16,6 @@ CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -# TODO: NCSDK-28931: Cannot use fprotect twice, so disable it in MCUboot to -# test protecting Matter factory data. It can be enabled while there is a support -# for protection more than one region. -CONFIG_FPROTECT=n - # required by SPI driver CONFIG_MULTITHREADING=y diff --git a/samples/matter/lock/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/lock/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf index b61eab093c54..c0915991a16b 100644 --- a/samples/matter/lock/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/lock/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -16,11 +16,6 @@ CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -# TODO: NCSDK-28931: Cannot use fprotect twice, so disable it in MCUboot to -# test protecting Matter factory data. It can be enabled while there is a support -# for protection more than one region. -CONFIG_FPROTECT=n - # required by SPI driver CONFIG_MULTITHREADING=y diff --git a/samples/matter/lock/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/matter/lock/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf index 0a20cbbde373..52300bdd681b 100644 --- a/samples/matter/lock/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf +++ b/samples/matter/lock/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf @@ -16,11 +16,6 @@ CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -# TODO: NCSDK-28931: Cannot use fprotect twice, so disable it in MCUboot to -# test protecting Matter factory data. It can be enabled while there is a support -# for protection more than one region. -CONFIG_FPROTECT=n - # required by SPI driver CONFIG_MULTITHREADING=y diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 0a20cbbde373..52300bdd681b 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -16,11 +16,6 @@ CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -# TODO: NCSDK-28931: Cannot use fprotect twice, so disable it in MCUboot to -# test protecting Matter factory data. It can be enabled while there is a support -# for protection more than one region. -CONFIG_FPROTECT=n - # required by SPI driver CONFIG_MULTITHREADING=y diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf index 7d1f57be0abc..c36b71f6ed64 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp_internal.conf @@ -4,10 +4,6 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -# TODO: NCSDK-28931: Cannot use fprotect twice, so disable it in MCUboot to -# test protecting Matter factory data. It can be enabled while there is a support -# for protection more than one region. -CONFIG_FPROTECT=n # TODO: Workaround, disable memory guard to avoid false faults in application after boot CONFIG_HW_STACK_PROTECTION=n diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf index 0a20cbbde373..52300bdd681b 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf @@ -16,11 +16,6 @@ CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -# TODO: NCSDK-28931: Cannot use fprotect twice, so disable it in MCUboot to -# test protecting Matter factory data. It can be enabled while there is a support -# for protection more than one region. -CONFIG_FPROTECT=n - # required by SPI driver CONFIG_MULTITHREADING=y diff --git a/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf index 0a20cbbde373..52300bdd681b 100644 --- a/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -16,11 +16,6 @@ CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -# TODO: NCSDK-28931: Cannot use fprotect twice, so disable it in MCUboot to -# test protecting Matter factory data. It can be enabled while there is a support -# for protection more than one region. -CONFIG_FPROTECT=n - # required by SPI driver CONFIG_MULTITHREADING=y diff --git a/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf index 0a20cbbde373..52300bdd681b 100644 --- a/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf +++ b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf @@ -16,11 +16,6 @@ CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -# TODO: NCSDK-28931: Cannot use fprotect twice, so disable it in MCUboot to -# test protecting Matter factory data. It can be enabled while there is a support -# for protection more than one region. -CONFIG_FPROTECT=n - # required by SPI driver CONFIG_MULTITHREADING=y diff --git a/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf index b61eab093c54..c0915991a16b 100644 --- a/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf +++ b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l15_cpuapp.conf @@ -16,11 +16,6 @@ CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -# TODO: NCSDK-28931: Cannot use fprotect twice, so disable it in MCUboot to -# test protecting Matter factory data. It can be enabled while there is a support -# for protection more than one region. -CONFIG_FPROTECT=n - # required by SPI driver CONFIG_MULTITHREADING=y diff --git a/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf index 0a20cbbde373..52300bdd681b 100644 --- a/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf +++ b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf @@ -16,11 +16,6 @@ CONFIG_SPI_NOR=y CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 -# TODO: NCSDK-28931: Cannot use fprotect twice, so disable it in MCUboot to -# test protecting Matter factory data. It can be enabled while there is a support -# for protection more than one region. -CONFIG_FPROTECT=n - # required by SPI driver CONFIG_MULTITHREADING=y diff --git a/west.yml b/west.yml index 8b3a94882901..d9c883e687b6 100644 --- a/west.yml +++ b/west.yml @@ -161,7 +161,7 @@ manifest: - name: matter repo-path: sdk-connectedhomeip path: modules/lib/matter - revision: f67310e6166ce4738985168fb3d74c5314539688 + revision: pull/510/head west-commands: scripts/west/west-commands.yml submodules: - name: nlio