1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-03 12:00:59 +00:00

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

[no changelog]
This commit is contained in:
tychovrahe 2024-12-18 09:58:06 +01:00
parent 2dbdd0b909
commit 2b030aeec1
5 changed files with 33 additions and 33 deletions

View File

@ -27,28 +27,24 @@
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
led0: led_0 { led0: led_0 {
gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
label = "Green LED 0"; label = "Green LED 0";
}; };
led1: led_1 { led1: led_1 {
gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
label = "Green LED 1"; label = "Green LED 1";
}; };
out0: out_0 {
gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
label = "FW Running";
};
}; };
buttons { buttons {
compatible = "gpio-keys"; compatible = "gpio-keys";
button0: button_0 { button0: button_0 {
gpios = <&gpio0 27 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; gpios = <&gpio0 14 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>;
label = "Push button switch 0"; label = "Push button switch 0";
zephyr,code = <INPUT_KEY_0>; zephyr,code = <INPUT_KEY_0>;
}; };
trezor_ready: trezor_ready { trezor_ready: trezor_ready {
gpios = <&gpio0 29 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>; gpios = <&gpio0 29 ( GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>;
label = "Trezor ready"; label = "Trezor ready";
zephyr,code = <INPUT_KEY_1>; zephyr,code = <INPUT_KEY_1>;
}; };
@ -59,9 +55,8 @@
led0 = &led0; led0 = &led0;
led1 = &led1; led1 = &led1;
sw0 = &button0; sw0 = &button0;
bootloader-led0 = &led0; bootloader-botton0 = &button0;
mcuboot-button0 = &button0; mcuboot-button0 = &button0;
mcuboot-led0 = &led0;
watchdog0 = &wdt0; watchdog0 = &wdt0;
}; };
}; };
@ -118,11 +113,7 @@
}; };
slot0_partition: partition@c000 { slot0_partition: partition@c000 {
label = "image-0"; label = "image-0";
reg = <0x0000C000 0x37000>; reg = <0x0000C000 0x7A000>;
};
slot1_partition: partition@43000 {
label = "image-1";
reg = <0x00043000 0x37000>;
}; };
storage_partition: partition@7a000 { storage_partition: partition@7a000 {
label = "storage"; label = "storage";

View File

@ -18,6 +18,7 @@ CONFIG_BOOT_SERIAL_UART=y
#CONFIG_MCUMGR_SMP_UART=y #CONFIG_MCUMGR_SMP_UART=y
CONFIG_MCUBOOT_BOOTLOADER_MODE_SINGLE_APP=y CONFIG_MCUBOOT_BOOTLOADER_MODE_SINGLE_APP=y
CONFIG_SINGLE_APPLICATION_SLOT=y CONFIG_SINGLE_APPLICATION_SLOT=y
CONFIG_BOOT_VALIDATE_SLOT0=y
CONFIG_RTT_CONSOLE=y CONFIG_RTT_CONSOLE=y
CONFIG_USE_SEGGER_RTT=y CONFIG_USE_SEGGER_RTT=y

View File

@ -89,3 +89,16 @@ CONFIG_LOG_PRINTK=n
CONFIG_NANOPB=n CONFIG_NANOPB=n
CONFIG_ASSERT=y 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

View File

@ -46,8 +46,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
#define RUN_STATUS_LED DK_LED1 #define RUN_STATUS_LED DK_LED1
#define RUN_LED_BLINK_INTERVAL 1000 #define RUN_LED_BLINK_INTERVAL 1000
#define FW_RUNNING_SIG DK_LED3 #define FW_RUNNING_SIG DK_LED2
#define CON_STATUS_LED DK_LED2
static K_SEM_DEFINE(ble_init_ok, 0, 1); static K_SEM_DEFINE(ble_init_ok, 0, 1);
static K_SEM_DEFINE(led_init_ok, 0, 1); static K_SEM_DEFINE(led_init_ok, 0, 1);
@ -231,7 +230,7 @@ void ble_write_thread(void) {
} }
void led_thread(void) { void led_thread(void) {
bool connected = false; // bool connected = false;
int blink_status = 0; int blink_status = 0;
/* Don't go any further until BLE is initialized */ /* Don't go any further until BLE is initialized */
k_sem_take(&led_init_ok, K_FOREVER); k_sem_take(&led_init_ok, K_FOREVER);
@ -240,17 +239,17 @@ void led_thread(void) {
blink_status++; blink_status++;
dk_set_led(RUN_STATUS_LED, (blink_status) % 2); dk_set_led(RUN_STATUS_LED, (blink_status) % 2);
connected = is_connected(); // connected = is_connected();
//
if (connected) { // if (connected) {
dk_set_led_on(CON_STATUS_LED); // dk_set_led_on(CON_STATUS_LED);
} else { // } else {
if (is_advertising() && !is_advertising_whitelist()) { // if (is_advertising() && !is_advertising_whitelist()) {
dk_set_led(CON_STATUS_LED, (blink_status) % 2); // dk_set_led(CON_STATUS_LED, (blink_status) % 2);
} else { // } else {
dk_set_led_off(CON_STATUS_LED); // dk_set_led_off(CON_STATUS_LED);
} // }
} // }
k_sleep(K_MSEC(RUN_LED_BLINK_INTERVAL)); k_sleep(K_MSEC(RUN_LED_BLINK_INTERVAL));
} }

View File

@ -15,7 +15,3 @@ manifest:
repo-path: sdk-nrf repo-path: sdk-nrf
revision: v2.7.0 revision: v2.7.0
import: true import: true
- name: mcuboot
url: https://github.com/hiviah/mcuboot
path: bootloader/mcuboot
revision: edfe1e1465dbc698bf9a195816247913490ab391