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

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
 ```
 
 

west/trezor/trezor-ble/mcuboot.conf.without_serial_recovery

@@ -1,25 +0,0 @@
-#CONFIG_PM_PARTITION_SIZE_MCUBOOT=0x10000
-
-#CONFIG_SERIAL=y
-#CONFIG_UART_LINE_CTRL=y
-#CONFIG_UART_NRFX=y
-#CONFIG_UART_INTERRUPT_DRIVEN=n
-
-# MCUBoot serial
-CONFIG_GPIO=y
-CONFIG_GPIO_NRFX_INTERRUPT=n
-#CONFIG_MCUBOOT_SERIAL=y
-#CONFIG_BOOT_SERIAL_CDC_ACM=y
-#CONFIG_BOOT_SERIAL_UART=y
-
-#CONFIG_LOG_BACKEND_UART=y
-
-#CONFIG_BOOT_SERIAL_DETECT_PIN=11
-#CONFIG_MCUMGR_SMP_UART=y
-CONFIG_MCUBOOT_BOOTLOADER_MODE_SINGLE_APP=y
-CONFIG_SINGLE_APPLICATION_SLOT=y
-
-CONFIG_RTT_CONSOLE=y
-CONFIG_USE_SEGGER_RTT=y
-CONFIG_UART_CONSOLE=n
-

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

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