michaelh/zephyr
1
0
Fork 0
Code Releases Activity

riscv: linker: fix __rom_region_end in non-XIP system

Browse source 
In non-XIP system, because ROMABLE_REGION == RAMABLE_REGION, setting
__rom_region_size/end symbol at linker script end will mistakely
contain RAMABLE_REGION in it.

Move __rom_region_end symbol to end of common ROMABLE_REGION (text
and rodata) instead in non-XIP system.

Signed-off-by: Jim Shu <cwshu@andestech.com>
This commit is contained in:
Jim Shu 2021-09-01 17:30:43 +08:00 • committed by Christopher Friedt
commit c1dc4a6f61
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/arch/riscv/common/linker.ld
View file

@ -188,6 +188,16 @@ SECTIONS
#include <linker/cplusplus-rom.ld> #include <linker/cplusplus-rom.ld>
__rodata_region_end = .; __rodata_region_end = .;
MPU_ALIGN(__rodata_region_end - __rom_region_start); MPU_ALIGN(__rodata_region_end - __rom_region_start);
/* For non-XIP system, __rom_region_end symbol should be set to
* the end of common ROMABLE_REGIONs (text and rodata) instead of
* the linker script end, so it wouldn't mistakely contain
* RAMABLE_REGION in it.
*/
#ifndef CONFIG_XIP
__rom_region_end = .;
__rom_region_size = __rom_region_end - __rom_region_start;
#endif /* CONFIG_XIP */
GROUP_END(ROMABLE_REGION) GROUP_END(ROMABLE_REGION)
GROUP_START(RAMABLE_REGION) GROUP_START(RAMABLE_REGION)
@ -361,6 +371,11 @@ GROUP_END(DTCM)
KEEP(*(.gnu.attributes)) KEEP(*(.gnu.attributes))
} }
/* Because ROMABLE_REGION != RAMABLE_REGION in XIP-system, it is valid
* to set __rom_region_end symbol at the end of linker script and
* doesn't mistakely contain the RAMABLE_REGION in it.
*/
#ifdef CONFIG_XIP
/* Must be last in romable region */ /* Must be last in romable region */
SECTION_PROLOGUE(.last_section,(NOLOAD),) SECTION_PROLOGUE(.last_section,(NOLOAD),)
{ {
@ -370,5 +385,6 @@ SECTION_PROLOGUE(.last_section,(NOLOAD),)
* calculate this value here. */ * calculate this value here. */
__rom_region_end = LOADADDR(.last_section); __rom_region_end = LOADADDR(.last_section);
__rom_region_size = __rom_region_end - __rom_region_start; __rom_region_size = __rom_region_end - __rom_region_start;
#endif
} }