arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-15 12:08:59 +00:00
Code Issues Releases Wiki Activity

feat(core): switch DISC2 to use newer U5G variant

Browse Source 
[no changelog]
This commit is contained in:
tychovrahe 2024-11-05 08:12:12 +01:00 committed by TychoVrahe
parent 5894c34f58
commit 5c101ab800
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/SConscript.firmware
View File

@ -855,7 +855,7 @@ if 'STM32F427xx' in CPPDEFINES_HAL or 'STM32F429xx' in CPPDEFINES_HAL:
'$DD if=$TARGET of=${TARGET}.p1 skip=0 bs=128k count=6',
'$CP $TARGET ' + BINARY_NAME,
]
elif 'STM32U5A9xx' in CPPDEFINES_HAL or 'STM32U585xx' in CPPDEFINES_HAL:
elif 'STM32U5G9xx' in CPPDEFINES_HAL or 'STM32U585xx' in CPPDEFINES_HAL:
action_bin=[
'$OBJCOPY -O binary -j .vendorheader -j .header -j .flash -j .data -j .confidential $SOURCE ${TARGET}',
'$HEADERTOOL -h $TARGET ' + ('-D' if not PRODUCTION else ''),

0
core/embed/models/D002/boards/stm32u5a9j-dk.h → core/embed/models/D002/boards/stm32u5g9j-dk.h
View File

2
core/embed/trezorhal/stm32u5/linker/u5a/boardloader.ld → core/embed/trezorhal/stm32u5/linker/u5g/boardloader.ld
View File

@ -1,4 +1,4 @@
INCLUDE "./embed/trezorhal/stm32u5/linker/u5a/memory.ld";
INCLUDE "./embed/trezorhal/stm32u5/linker/u5g/memory.ld";
ENTRY(reset_handler)

2
core/embed/trezorhal/stm32u5/linker/u5a/bootloader.ld → core/embed/trezorhal/stm32u5/linker/u5g/bootloader.ld
View File

@ -1,4 +1,4 @@
INCLUDE "./embed/trezorhal/stm32u5/linker/u5a/memory.ld";
INCLUDE "./embed/trezorhal/stm32u5/linker/u5g/memory.ld";
ENTRY(reset_handler)

2
core/embed/trezorhal/stm32u5/linker/u5a/firmware.ld → core/embed/trezorhal/stm32u5/linker/u5g/firmware.ld
View File

@ -1,4 +1,4 @@
INCLUDE "./embed/trezorhal/stm32u5/linker/u5a/memory.ld";
INCLUDE "./embed/trezorhal/stm32u5/linker/u5g/memory.ld";
ENTRY(reset_handler)

2
core/embed/trezorhal/stm32u5/linker/u5a/kernel.ld → core/embed/trezorhal/stm32u5/linker/u5g/kernel.ld
View File

@ -1,4 +1,4 @@
INCLUDE "./embed/trezorhal/stm32u5/linker/u5a/memory.ld";
INCLUDE "./embed/trezorhal/stm32u5/linker/u5g/memory.ld";
ENTRY(reset_handler)

2
core/embed/trezorhal/stm32u5/linker/u5a/memory.ld → core/embed/trezorhal/stm32u5/linker/u5g/memory.ld
View File

@ -15,4 +15,4 @@ MCU_SRAM4_SIZE = 16K;
MCU_SRAM5 = 0x301A0000;
MCU_SRAM5_SIZE = 832K;
MCU_SRAM6 = 0x30270000;
MCU_SRAM6_SIZE = 0K ;
MCU_SRAM6_SIZE = 512K ;

2
core/embed/trezorhal/stm32u5/linker/u5a/prodtest.ld → core/embed/trezorhal/stm32u5/linker/u5g/prodtest.ld
View File

@ -1,4 +1,4 @@
INCLUDE "./embed/trezorhal/stm32u5/linker/u5a/memory.ld";
INCLUDE "./embed/trezorhal/stm32u5/linker/u5g/memory.ld";
ENTRY(reset_handler)

6
core/site_scons/models/D002/discovery2.py
View File

@ -12,12 +12,12 @@ def configure(
paths: list[str],
) -> list[str]:
features_available: list[str] = []
board = "D002/boards/stm32u5a9j-dk.h"
board = "D002/boards/stm32u5g9j-dk.h"
hw_model = get_hw_model_as_number("D002")
hw_revision = 0
mcu = "STM32U5A9xx"
linker_script = """embed/trezorhal/stm32u5/linker/u5a/{target}.ld"""
mcu = "STM32U5G9xx"
linker_script = """embed/trezorhal/stm32u5/linker/u5g/{target}.ld"""
stm32u5_common_files(env, defines, sources, paths)