Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manifest: update NCS #130

Merged
merged 3 commits into from
Jun 3, 2024
Merged

manifest: update NCS #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a15f1c
manifest: update NCS
maxd-nordic Jun 3, 2024
ab8ed6a
app: transport: Update SMF interface
maxd-nordic Jun 3, 2024
c19fa3e
workflows: dfu_check: update nrf53 setup
maxd-nordic Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dfu_check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 4 additions & 2 deletions app/src/modules/transport/transport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 1 addition & 3 deletions scripts/pmr_nrf53.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ manifest:
- name: nrf
remote: ncs
repo-path: sdk-nrf
revision: pull/15473/head
revision: ca9fd500085adefe4b742fba8166bd692e07f808
import: true
Loading