arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-06-29 03:12:34 +00:00
Code Issues Releases Wiki Activity

fix(emulator): fix bootloader emulator build on MacOS

Browse Source 
[no changelog]
This commit is contained in:
cepetr 2024-10-30 12:57:26 +01:00 committed by cepetr
parent 8bc3890639
commit 0bacbdf355
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/SConscript.bootloader_emu
View File

@ -187,7 +187,7 @@ env.Replace(
'-g3 ' '-g3 '
'-nostdlib ' '-nostdlib '
'-std=gnu11 -Wall -Werror -Wpointer-arith -Wno-missing-braces -fno-common ' '-std=gnu11 -Wall -Werror -Wpointer-arith -Wno-missing-braces -fno-common '
'-fsingle-precision-constant -fdata-sections -ffunction-sections ' '-fdata-sections -ffunction-sections '
'-ffreestanding ' '-ffreestanding '
'-fstack-protector-all ' '-fstack-protector-all '
+ CCFLAGS_MOD, + CCFLAGS_MOD,

4
core/embed/bootloader/emulator.c
View File

@ -146,13 +146,13 @@ __attribute__((noreturn)) int main(int argc, char **argv) {
set_variant = 1; set_variant = 1;
bitcoin_only = atoi(optarg); bitcoin_only = atoi(optarg);
break; break;
case 'f': case 'f': {
uint8_t hash[BLAKE2S_DIGEST_LENGTH]; uint8_t hash[BLAKE2S_DIGEST_LENGTH];
if (!load_firmware(optarg, hash)) { if (!load_firmware(optarg, hash)) {
exit(1); exit(1);
} }
bootargs_set(BOOT_COMMAND_INSTALL_UPGRADE, hash, sizeof(hash)); bootargs_set(BOOT_COMMAND_INSTALL_UPGRADE, hash, sizeof(hash));
break; } break;
#ifdef USE_OPTIGA #ifdef USE_OPTIGA
case 'l': case 'l':
// write bootloader-lock secret // write bootloader-lock secret

2
core/embed/bootloader/main.c
View File

@ -99,7 +99,7 @@ typedef enum {
void failed_jump_to_firmware(void); void failed_jump_to_firmware(void);
CONFIDENTIAL volatile secbool dont_optimize_out_true = sectrue; CONFIDENTIAL volatile secbool dont_optimize_out_true = sectrue;
CONFIDENTIAL volatile void (*firmware_jump_fn)(void) = failed_jump_to_firmware; CONFIDENTIAL void (*volatile firmware_jump_fn)(void) = failed_jump_to_firmware;
static void usb_init_all(secbool usb21_landing) { static void usb_init_all(secbool usb21_landing) {
usb_dev_info_t dev_info = { usb_dev_info_t dev_info = {

5
core/embed/bootloader/messages.c
View File

@ -395,7 +395,10 @@ void process_msg_FirmwareErase(uint8_t iface_num, uint32_t msg_size,
static uint32_t chunk_size = 0; static uint32_t chunk_size = 0;
__attribute__((section(".buf"))) uint32_t chunk_buffer[IMAGE_CHUNK_SIZE / 4]; #ifndef TREZOR_EMULATOR
__attribute__((section(".buf")))
#endif
uint32_t chunk_buffer[IMAGE_CHUNK_SIZE / 4];
#define CHUNK_BUFFER_PTR ((const uint8_t *const)&chunk_buffer) #define CHUNK_BUFFER_PTR ((const uint8_t *const)&chunk_buffer)