From 36d5d8790736c2b2e0a8822e814179b7b8daadb1 Mon Sep 17 00:00:00 2001 From: Adrian Gielniewski Date: Fri, 17 Jan 2025 12:33:27 +0100 Subject: [PATCH 1/2] manifest: Update sdk-connectedhomeip revision Update sdk-connectedhomeip revision. Signed-off-by: Adrian Gielniewski --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 4c15375a20f2..31c81c0251f3 100644 --- a/west.yml +++ b/west.yml @@ -158,7 +158,7 @@ manifest: - name: matter repo-path: sdk-connectedhomeip path: modules/lib/matter - revision: v2.8.0 + revision: pull/532/head west-commands: scripts/west/west-commands.yml submodules: - name: nlio From b10520e7dd430a1b755d0edd74fa2e73e27b1b9c Mon Sep 17 00:00:00 2001 From: Adrian Gielniewski Date: Thu, 9 Jan 2025 15:23:08 +0100 Subject: [PATCH 2/2] samples: matter: Disable GPIO forwarder in mcuboot Disable GPIO forwarder in mcuboot for nRF5340 DK for nRF7002 EK compatibility. Signed-off-by: Adrian Gielniewski (cherry picked from commit f26a3904094961c09ad0901f681eb6644c7e3948) --- .../sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay | 5 +++++ .../sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay | 5 +++++ .../sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay | 5 +++++ .../sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay | 5 +++++ .../sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay | 5 +++++ .../sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay | 5 +++++ .../sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay | 5 +++++ .../sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay | 5 +++++ 8 files changed, 40 insertions(+) diff --git a/applications/matter_bridge/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/applications/matter_bridge/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay index 46485bd08db6..f0997a0c6911 100644 --- a/applications/matter_bridge/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/applications/matter_bridge/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -10,3 +10,8 @@ zephyr,code-partition = &boot_partition; }; }; + +// Disable GPIO forwarder for nRF7002 EK compatibility +&gpio_fwd { + status = "disabled"; +}; diff --git a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay index 6ea64210d733..564237fb727f 100644 --- a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -10,3 +10,8 @@ nordic,pm-ext-flash = &mx25r64; }; }; + +// Disable GPIO forwarder for nRF7002 EK compatibility +&gpio_fwd { + status = "disabled"; +}; diff --git a/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay index 6ea64210d733..564237fb727f 100644 --- a/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/light_switch/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -10,3 +10,8 @@ nordic,pm-ext-flash = &mx25r64; }; }; + +// Disable GPIO forwarder for nRF7002 EK compatibility +&gpio_fwd { + status = "disabled"; +}; diff --git a/samples/matter/lock/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/lock/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay index 6ea64210d733..564237fb727f 100644 --- a/samples/matter/lock/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/lock/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -10,3 +10,8 @@ nordic,pm-ext-flash = &mx25r64; }; }; + +// Disable GPIO forwarder for nRF7002 EK compatibility +&gpio_fwd { + status = "disabled"; +}; diff --git a/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay index d1aa58695444..4738ca7656df 100644 --- a/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/smoke_co_alarm/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -10,3 +10,8 @@ nordic,pm-ext-flash = &mx25r64; }; }; + +// Disable GPIO forwarder for nRF7002 EK compatibility +&gpio_fwd { + status = "disabled"; +}; diff --git a/samples/matter/template/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/template/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay index 6ea64210d733..564237fb727f 100644 --- a/samples/matter/template/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/template/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -10,3 +10,8 @@ nordic,pm-ext-flash = &mx25r64; }; }; + +// Disable GPIO forwarder for nRF7002 EK compatibility +&gpio_fwd { + status = "disabled"; +}; diff --git a/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay index 6ea64210d733..564237fb727f 100644 --- a/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/thermostat/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -10,3 +10,8 @@ nordic,pm-ext-flash = &mx25r64; }; }; + +// Disable GPIO forwarder for nRF7002 EK compatibility +&gpio_fwd { + status = "disabled"; +}; diff --git a/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay index 6ea64210d733..564237fb727f 100644 --- a/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/window_covering/sysbuild/mcuboot/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -10,3 +10,8 @@ nordic,pm-ext-flash = &mx25r64; }; }; + +// Disable GPIO forwarder for nRF7002 EK compatibility +&gpio_fwd { + status = "disabled"; +};