From 9a15f1c253f4ddde981f6f8b920d31ab34ee8bb0 Mon Sep 17 00:00:00 2001 From: Maximilian Deubel Date: Mon, 3 Jun 2024 15:23:47 +0200 Subject: [PATCH 1/3] manifest: update NCS Update NCS to the latest version. Breaking change: sysbuild Signed-off-by: Maximilian Deubel --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 7c80deac..19691ba5 100644 --- a/west.yml +++ b/west.yml @@ -14,5 +14,5 @@ manifest: - name: nrf remote: ncs repo-path: sdk-nrf - revision: pull/15473/head + revision: ca9fd500085adefe4b742fba8166bd692e07f808 import: true From ab8ed6aefc1fab4778d99d2b3a2e24904b1d3b2c Mon Sep 17 00:00:00 2001 From: Maximilian Deubel Date: Mon, 3 Jun 2024 15:37:17 +0200 Subject: [PATCH 2/3] app: transport: Update SMF interface This patch updates how the transport modules uses SMF. There was a breaking change in the API. Signed-off-by: Maximilian Deubel --- app/src/modules/transport/transport.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/modules/transport/transport.c b/app/src/modules/transport/transport.c index 6b139059..5906e0b2 100644 --- a/app/src/modules/transport/transport.c +++ b/app/src/modules/transport/transport.c @@ -225,8 +225,10 @@ static void connected_exit(void *o) /* Construct state table */ static const struct smf_state state[] = { - [CLOUD_DISCONNECTED] = SMF_CREATE_STATE(disconnected_entry, disconnected_run, NULL), - [CLOUD_CONNECTED] = SMF_CREATE_STATE(connected_entry, connected_run, connected_exit), + [CLOUD_DISCONNECTED] = SMF_CREATE_STATE(disconnected_entry, disconnected_run, NULL, + NULL, NULL), + [CLOUD_CONNECTED] = SMF_CREATE_STATE(connected_entry, connected_run, connected_exit, + NULL, NULL), }; static void date_time_handler(const struct date_time_evt *evt) { From c19fa3eb25fea84df7a770a53da18b38730762c8 Mon Sep 17 00:00:00 2001 From: Maximilian Deubel Date: Mon, 3 Jun 2024 15:49:34 +0200 Subject: [PATCH 3/3] workflows: dfu_check: update nrf53 setup Breaking change: - ECDSA certificate is now used for signing apps - partition table of the nrf53 has been changed slightly Signed-off-by: Maximilian Deubel --- .github/workflows/dfu_check.yml | 4 ++-- scripts/pmr_nrf53.txt | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dfu_check.yml b/.github/workflows/dfu_check.yml index 693851c2..5eac1c7e 100644 --- a/.github/workflows/dfu_check.yml +++ b/.github/workflows/dfu_check.yml @@ -81,9 +81,9 @@ jobs: - name: 'nrf53: check app image signature' working-directory: thingy91x-oob run: | - python3 ${CI_MCUBOOT_DIR}/scripts/imgtool.py verify -k ${CI_MCUBOOT_DIR}/root-rsa-2048.pem twister-out/thingy91x_nrf5340_cpuapp/applications.connectivity_bridge/zephyr/app_update.bin + python3 ${CI_MCUBOOT_DIR}/scripts/imgtool.py verify -k ${CI_MCUBOOT_DIR}/root-ec-p256.pem twister-out/thingy91x_nrf5340_cpuapp/applications.connectivity_bridge/connectivity_bridge/zephyr/zephyr.signed.bin - name: 'nrf53: check bootloader image signature' working-directory: thingy91x-oob run: | - python3 scripts/nsib_signature_check.py -i twister-out/thingy91x_nrf5340_cpuapp/applications.connectivity_bridge/zephyr/signed_by_b0_s0_image.hex -p verifying_key_nrf53.pem -a 0x00008200 + python3 scripts/nsib_signature_check.py -i twister-out/thingy91x_nrf5340_cpuapp/applications.connectivity_bridge/signed_by_mcuboot_and_b0_mcuboot.hex -p verifying_key_nrf53.pem -a 0x00008200 diff --git a/scripts/pmr_nrf53.txt b/scripts/pmr_nrf53.txt index 8fd894db..9e081b2c 100644 --- a/scripts/pmr_nrf53.txt +++ b/scripts/pmr_nrf53.txt @@ -16,9 +16,7 @@ | 0x30200: app (0x63e00 - 399kB) | +--------------------------------------------------+ | 0x94000: mcuboot_secondary (0x64000 - 400kB) | -| 0xf8000: EMPTY_1 (0x4000 - 16kB) | -| 0xfc000: settings_storage (0x2000 - 8kB) | -| 0xfe000: EMPTY_0 (0x2000 - 8kB) | +| 0xf8000: settings_storage (0x8000 - 32kB) | +--------------------------------------------------+ otp (0x2fc - 764B):