Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CI bootloader build for T2B1 #3399

Merged
merged 1 commit into from
Nov 14, 2023
Merged

Fix CI bootloader build for T2B1 #3399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/SConscript.bootloader_ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down Expand Up @@ -152,6 +152,7 @@ env.Replace(
'vendor/nanopb',
] + CPPPATH_MOD + PATH_HAL,
CPPDEFINES=[
'BOOTLOADER',
'TREZOR_MODEL_'+TREZOR_MODEL,
'USE_HAL_DRIVER',
'PB_FIELD_16BIT',
Expand Down
2 changes: 1 addition & 1 deletion core/embed/bootloader_ci/messages.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Loading