From aa3f537ee3a7376d8a062d68d7cac8a298431b75 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Mon, 13 Nov 2023 23:21:12 +0100 Subject: [PATCH] build(core): fix CI bootloader build for T2B1 [no changelog] --- core/SConscript.bootloader_ci | 3 ++- core/embed/bootloader_ci/messages.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/SConscript.bootloader_ci b/core/SConscript.bootloader_ci index afffdbc8684..4fe32da421d 100644 --- a/core/SConscript.bootloader_ci +++ b/core/SConscript.bootloader_ci @@ -18,7 +18,7 @@ if TREZOR_MODEL in ('1', 'DISC1'): ) Return() -FEATURES_WANTED = ["input", "usb"] +FEATURES_WANTED = ["input", "rgb_led", "consumption_mask", "usb", "optiga"] CCFLAGS_MOD = '' CPPPATH_MOD = [] @@ -152,6 +152,7 @@ env.Replace( 'vendor/nanopb', ] + CPPPATH_MOD + PATH_HAL, CPPDEFINES=[ + 'BOOTLOADER', 'TREZOR_MODEL_'+TREZOR_MODEL, 'USE_HAL_DRIVER', 'PB_FIELD_16BIT', diff --git a/core/embed/bootloader_ci/messages.c b/core/embed/bootloader_ci/messages.c index d3af48627cc..3f5a92f83c7 100644 --- a/core/embed/bootloader_ci/messages.c +++ b/core/embed/bootloader_ci/messages.c @@ -501,7 +501,7 @@ int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size, read_image_header(chunk_buffer + vhdr.hdrlen, FIRMWARE_IMAGE_MAGIC, FIRMWARE_IMAGE_MAXSIZE); - if (received_hdr != (const image_header *)chunk_buffer + vhdr.hdrlen) { + if (received_hdr != (const image_header *)(chunk_buffer + vhdr.hdrlen)) { MSG_SEND_INIT(Failure); MSG_SEND_ASSIGN_VALUE(code, FailureType_Failure_ProcessError); MSG_SEND_ASSIGN_STRING(message, "Invalid firmware header");