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

Bump Nordic Connect SDK to 2.9.0 #4731

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bump Nordic Connect SDK to 2.9.0 #4731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions nordic/trezor/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,22 @@ Follow these steps to set up the project on your local machine.

Using nrfutil, install the required toolchain for the nRF Connect SDK:
```sh
nrfutil toolchain-manager install --ncs-version v2.6.2
nrfutil toolchain-manager install --ncs-version v2.9.0
```

### Launch the nRF Shell

First, launch the nRF shell using the `nrfutil` toolchain manager:
First, launch the nRF shell using the `nrfutil` toolchain manager and set the NCS to chosen version:

```sh
nrfutil toolchain-manager launch --shell
west init -m https://github.com/nrfconnect/sdk-nrf --mr v2.9.0 v2.9.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don''t think this is needed; we have west init below which will use the west.yml already specifying 2.9.0, so that, along with west update will do the trick

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am really unsure about this, it should be as you say, but I had to rebuild fresh many times until pythons from 2 toolchains stopped interfering with each other (it seemed without using this it mixed selected from west.yml with toolchain nrfutil toolchain-manager list listed as default).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i experienced the python mismatch too, for me it helped building with --pristine after the update (and i also uninstalled the older toolchain, but that didn't help). But with this line, we now have west init twice in the readme, which seems wrong to me. I'd say lets remove it now and see what happens

```

### Initialize the Workspace
Initialize your West workspace for the Trezor BLE Gateway project:
```sh
cd west
cd nordic
west init -l ./trezor
```

Expand Down
9 changes: 9 additions & 0 deletions nordic/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zephyr,code-partition = &slot0_partition;
zephyr,bt-hci = &bt_hci_controller;
Copy link
Contributor

@TychoVrahe TychoVrahe Mar 6, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add these changes to the t3w1_d1_nrf52833 board too

};

leds {
Expand Down Expand Up @@ -61,6 +62,14 @@
};
};

&bt_hci_sdc {
status = "disabled";
};

&bt_hci_controller {
status = "okay";
};

&adc {
status = "okay";
};
Expand Down
9 changes: 8 additions & 1 deletion nordic/trezor/west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,12 @@ manifest:
- name: nrf
remote: ncs
repo-path: sdk-nrf
revision: v2.7.0
revision: v2.9.0
import: true

# Temporarily disable mcuboot fork until it's ready
# - name: mcuboot
# url: https://github.com/trezor/mcuboot
# revision: v2.1.0-ncs3
# path: bootloader/mcuboot