From 4b6db8a789ad5506d9ee754af98f9594c1b19c4a Mon Sep 17 00:00:00 2001 From: Ondrej Mikle Date: Mon, 24 Feb 2025 17:20:55 +0100 Subject: [PATCH] feat(nordic): Bump NCS to 2.9.0 for Nordic, fix build and fork to our mcuboot [no changelog] --- .../boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.dts | 9 +++++++++ nordic/trezor/west.yml | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/nordic/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.dts b/nordic/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.dts index 23fa72dcd7..a0b65d7d06 100644 --- a/nordic/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.dts +++ b/nordic/trezor/boards/arm/t3w1_revA_nrf52832/t3w1_revA_nrf52832.dts @@ -22,6 +22,7 @@ zephyr,sram = &sram0; zephyr,flash = &flash0; zephyr,code-partition = &slot0_partition; + zephyr,bt-hci = &bt_hci_controller; }; leds { @@ -61,6 +62,14 @@ }; }; +&bt_hci_sdc { + status = "disabled"; +}; + +&bt_hci_controller { + status = "okay"; +}; + &adc { status = "okay"; }; diff --git a/nordic/trezor/west.yml b/nordic/trezor/west.yml index 66e23f9871..bc8a39ec38 100644 --- a/nordic/trezor/west.yml +++ b/nordic/trezor/west.yml @@ -13,5 +13,11 @@ manifest: - name: nrf remote: ncs repo-path: sdk-nrf - revision: v2.7.0 + revision: v2.9.0 import: true + + - name: mcuboot + url: https://github.com/trezor/mcuboot + revision: v2.1.0-ncs3 + path: bootloader/mcuboot +