fixup! feat(ble): integrate MCU boot into trezor-ble app, add stay in…

… bootloader pin
trezor · Dec 20, 2024 · f82b926 · f82b926
1 parent 2b030ae
commit f82b926
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 34 deletions.
diff --git a/west/trezor/README.md b/west/trezor/README.md
@@ -61,7 +61,7 @@ west update
 Build the application for the t3w1_revA_nrf52832 board:
 ```sh
 cd trezor
-west build ./trezor-ble -b t3w1_revA_nrf52832
+west build ./trezor-ble -b t3w1_revA_nrf52832 --sysbuild
 ```
 
 

diff --git a/west/trezor/trezor-ble/mcuboot.conf.without_serial_recovery b/west/trezor/trezor-ble/mcuboot.conf.without_serial_recovery
diff --git a/west/trezor/trezor-ble/prj.conf b/west/trezor/trezor-ble/prj.conf
@@ -94,11 +94,3 @@ CONFIG_ASSERT=y
 # bootloader
 #CONFIG_SECURE_BOOT=y
 CONFIG_BOOTLOADER_MCUBOOT=y
-#CONFIG_SB_SIGNING_OPENSSL=y
-#CONFIG_SB_SIGNING_KEY_FILE="/home/ondro/work/satoshilabs/repos/ncs/mcuboot_priv.pem"
-#CONFIG_SB_SIGNING_KEY_FILE="/home/ondro/work/satoshilabs/repos/ncs/mcuboot_priv.pem"
-#CONFIG_SB_PUBLIC_KEY_FILES="/home/ondro/work/satoshilabs/repos/ncs/mcuboot_pub.pem"
-#CONFIG_MCUBOOT_SIGNATURE_KEY_FILE="/home/ondro/work/satoshilabs/repos/ncs/mcuboot_priv.pem"
-#CONFIG_MCUBOOT_SIGNATURE_KEY_FILE="/home/ondro/work/satoshilabs/repos/ncs/mcuboot_priv.pem"
-#CONFIG_BOOT_SIGNATURE_KEY_FILE="/home/ondro/work/satoshilabs/repos/ncs/mcuboot_priv.pem"
-CONFIG_MCUBOOT_BOOTLOADER_MODE_SINGLE_APP=y
diff --git a/west/trezor/trezor-ble/sysbuild.conf b/west/trezor/trezor-ble/sysbuild.conf
@@ -0,0 +1,5 @@
+# Sysbuild configuration file.
+
+# Enable MCUboot
+SB_CONFIG_BOOTLOADER_MCUBOOT=y
+SB_CONFIG_MCUBOOT_MODE_SINGLE_APP=y
diff --git a/west/trezor/trezor-ble/mcuboot.conf → west/trezor/trezor-ble/sysbuild/mcuboot.conf b/west/trezor/trezor-ble/mcuboot.conf → west/trezor/trezor-ble/sysbuild/mcuboot.conf