arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-15 02:58:12 +00:00
Code Issues Releases Wiki Activity

fixup! refactor(core): combined build of coreapp + kernel, linker scripts refactoring

Browse Source
This commit is contained in:
tychovrahe 2024-09-10 17:29:57 +02:00
parent 6f845d758e
commit c86132ff6e
6 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/embed/models/T2B1/memory.ld
View File

@ -25,6 +25,8 @@ STORAGE_1_SECTOR_START = 0x4;
STORAGE_1_SECTOR_END = 0x4; STORAGE_1_SECTOR_END = 0x4;
STORAGE_2_SECTOR_START = 0x10; STORAGE_2_SECTOR_START = 0x10;
STORAGE_2_SECTOR_END = 0x10; STORAGE_2_SECTOR_END = 0x10;
KERNEL_CCMRAM_SIZE = 0x6000;
KERNEL_SRAM_SIZE = 0x400;
BOOTARGS_SIZE = 0x100; BOOTARGS_SIZE = 0x100;
BOARD_CAPABILITIES_ADDR = 0x800bf00; BOARD_CAPABILITIES_ADDR = 0x800bf00;
CODE_ALIGNMENT = 0x200; CODE_ALIGNMENT = 0x200;

2
core/embed/models/T2B1/model_T2B1.h
View File

@ -53,6 +53,8 @@
#define STORAGE_1_SECTOR_END 4 #define STORAGE_1_SECTOR_END 4
#define STORAGE_2_SECTOR_START 16 #define STORAGE_2_SECTOR_START 16
#define STORAGE_2_SECTOR_END 16 #define STORAGE_2_SECTOR_END 16
#define KERNEL_CCMRAM_SIZE 24 * 1024
#define KERNEL_SRAM_SIZE 1 * 1024
#define BOOTARGS_SIZE 0x100 #define BOOTARGS_SIZE 0x100
#define BOARD_CAPABILITIES_ADDR 0x0800BF00 #define BOARD_CAPABILITIES_ADDR 0x0800BF00

5
core/embed/trezorhal/stm32f4/consumption_mask.c
View File

@ -29,10 +29,7 @@
#error Not implemented for boardloader! #error Not implemented for boardloader!
#endif #endif
#if defined BOOTLOADER __attribute__((section(".buf"))) uint32_t pwm_data[SAMPLES] = {0};
__attribute__((section(".buf")))
#endif
uint32_t pwm_data[SAMPLES] = {0};
void consumption_mask_randomize() { void consumption_mask_randomize() {
for (int i = 0; i < SAMPLES; i++) { for (int i = 0; i < SAMPLES; i++) {

3
core/embed/trezorhal/stm32f4/limited_util.S
View File

@ -10,10 +10,13 @@ memset_reg:
// r1 - address of first word following the address in r0 to NOT write (exclusive) // r1 - address of first word following the address in r0 to NOT write (exclusive)
// r2 - word value to be written // r2 - word value to be written
// both addresses in r0 and r1 needs to be divisible by 4! // both addresses in r0 and r1 needs to be divisible by 4!
cmp r0, r1
beq .L_loop_end
.L_loop_begin: .L_loop_begin:
str r2, [r0], 4 // store the word in r2 to the address in r0, post-indexed str r2, [r0], 4 // store the word in r2 to the address in r0, post-indexed
cmp r0, r1 cmp r0, r1
bne .L_loop_begin bne .L_loop_begin
.L_loop_end:
bx lr bx lr
.global jump_to .global jump_to

2
core/embed/trezorhal/stm32f4/linker/kernel.ld
View File

@ -9,7 +9,7 @@ MEMORY {
SRAM (wal) : ORIGIN = MCU_SRAM + MCU_SRAM_SIZE - KERNEL_SRAM_SIZE, LENGTH = KERNEL_SRAM_SIZE SRAM (wal) : ORIGIN = MCU_SRAM + MCU_SRAM_SIZE - KERNEL_SRAM_SIZE, LENGTH = KERNEL_SRAM_SIZE
} }
main_stack_base = ORIGIN(SRAM) + SIZEOF(.stack); /* 8-byte aligned full descending stack */ main_stack_base = ORIGIN(CCMRAM) + SIZEOF(.stack); /* 8-byte aligned full descending stack */
_sstack = ORIGIN(SRAM); _sstack = ORIGIN(SRAM);
_estack = main_stack_base; _estack = main_stack_base;

4
core/embed/trezorhal/stm32f4/mpu.c
View File

@ -521,14 +521,14 @@ mpu_mode_t mpu_reconfig(mpu_mode_t mode) {
case MPU_MODE_ASSETS: case MPU_MODE_ASSETS:
DIS_REGION( 5 ); DIS_REGION( 5 );
// Assets (Privileged, Read-Write, Non-Executable) // Assets (Privileged, Read-Write, Non-Executable)
SET_REGION( 6, FLASH_BASE + 0x108000, SIZE_32KB, 0x00, FLASH_DATA, PRIV_RW ); SET_REGION( 6, FLASH_BASE + 0x104000, SIZE_32KB, 0x00, FLASH_DATA, PRIV_RW );
break; break;
case MPU_MODE_APP: case MPU_MODE_APP:
// Unused (maybe privileged kernel code in the future) // Unused (maybe privileged kernel code in the future)
DIS_REGION( 5 ); DIS_REGION( 5 );
// Assets (Unprivileged, Read-Only, Non-Executable) // Assets (Unprivileged, Read-Only, Non-Executable)
SET_REGION( 6, FLASH_BASE + 0x108000, SIZE_32KB, 0x00, FLASH_DATA, PRIV_RO_URO ); SET_REGION( 6, FLASH_BASE + 0x104000, SIZE_32KB, 0x00, FLASH_DATA, PRIV_RO_URO );
break; break;
#else #else