From d3a5479261774257400a0c7b2ac4888f4d55ccb9 Mon Sep 17 00:00:00 2001 From: tychovrahe Date: Wed, 9 Nov 2022 16:27:57 +0100 Subject: [PATCH] fixup! feat(core/rust): bootloader implementation in rust --- core/embed/bootloader/memory.ld | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/core/embed/bootloader/memory.ld b/core/embed/bootloader/memory.ld index 2c9eb74405..5010b58144 100644 --- a/core/embed/bootloader/memory.ld +++ b/core/embed/bootloader/memory.ld @@ -23,7 +23,7 @@ ccmram_end = ORIGIN(CCMRAM) + LENGTH(CCMRAM); sram_start = ORIGIN(SRAM); sram_end = ORIGIN(SRAM) + LENGTH(SRAM); -_codelen = SIZEOF(.flash) + SIZEOF(.data) + SIZEOF(.exidx) + SIZEOF(.align); +_codelen = SIZEOF(.flash) + SIZEOF(.data); SECTIONS { .header : ALIGN(4) { @@ -36,15 +36,6 @@ SECTIONS { *(.text*); . = ALIGN(4); *(.rodata*); - . = ALIGN(4); - } >FLASH AT>FLASH - - /* exception handling info generated by llvm which should consist of 8 bytes of "cantunwind" */ - .exidx : ALIGN(4) { - *(.ARM.exidx*); - } >FLASH AT>FLASH - - .align : ALIGN(4) { . = ALIGN(512); } >FLASH AT>FLASH @@ -57,6 +48,10 @@ SECTIONS { . = ALIGN(512); } >CCMRAM AT>FLASH + /DISCARD/ : { + *(.ARM.exidx*); + } + .bss : ALIGN(4) { *(.bss*); . = ALIGN(4);