From a9614fdff5ab7804cfe7fad245ab56566fcf48bd Mon Sep 17 00:00:00 2001 From: Jordan Yates Date: Tue, 28 Jul 2026 12:14:34 +1000 Subject: [PATCH 1/3] scripts: examples: cpatch_demo: fix explicit commit Use the originally stored explicit commit instead of overwriting the value at the restore point. Signed-off-by: Jordan Yates --- scripts/examples/cpatch_demo.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/examples/cpatch_demo.sh b/scripts/examples/cpatch_demo.sh index 5804e8eb8..dedbead3b 100755 --- a/scripts/examples/cpatch_demo.sh +++ b/scripts/examples/cpatch_demo.sh @@ -31,7 +31,6 @@ west release-build -r $RELEASE_FILE --skip-git if [ "$#" -eq 2 ]; then # Revert to original commit - START_COMMIT=`git -C $APP_DIR rev-parse HEAD` echo "Checking out: $START_COMMIT" git -C $APP_DIR checkout $START_COMMIT &> /dev/null west update > /dev/null From 05e1c21eb521e4663a1f8bc68e5d59a357920b0d Mon Sep 17 00:00:00 2001 From: Jordan Yates Date: Tue, 28 Jul 2026 12:13:12 +1000 Subject: [PATCH 2/3] manifest: update zephyr fork Update zephyr fork to support Twister filtering at the SoC level. Signed-off-by: Jordan Yates --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index ce773c691..ff109cefe 100644 --- a/west.yml +++ b/west.yml @@ -16,7 +16,7 @@ manifest: projects: - name: zephyr - revision: 92e97b3f42b59c633c30a476659043d92cf79fd0 + revision: 9bb2e5b22dc18c6a7663075c305aa335fd959e46 # Limit imported repositories to reduce clone time import: name-allowlist: From ecb203cbdc0bddd95c0b2c57cd116e4bf7558873 Mon Sep 17 00:00:00 2001 From: Jordan Yates Date: Tue, 28 Jul 2026 12:13:43 +1000 Subject: [PATCH 3/3] samples: nrf91x1_emc_shell: fix twister failures Fix twister failures by filtering incompible boards at the SoC level rather than relying on post cmake Kconfig filters. Signed-off-by: Jordan Yates --- samples/nrf91x1_emc_shell/sample.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/samples/nrf91x1_emc_shell/sample.yaml b/samples/nrf91x1_emc_shell/sample.yaml index 46150630a..e7b85c3a4 100644 --- a/samples/nrf91x1_emc_shell/sample.yaml +++ b/samples/nrf91x1_emc_shell/sample.yaml @@ -3,7 +3,10 @@ sample: name: nRF91x1 LTE modem EMC common: build_only: true - filter: CONFIG_SOC_NRF9120 and CONFIG_BUILD_WITH_TFM and dt_chosen_enabled("zephyr,shell-uart") + socs_allow: + - nrf9151 + - nrf9161 + filter: CONFIG_BUILD_WITH_TFM and dt_chosen_enabled("zephyr,shell-uart") integration_platforms: - nrf9161dk/nrf9161/ns - nrf9151dk/nrf9151/ns