adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

arm64: linker: leave app_smem before .data

Browse source 
Commit 87f68b4dfe ("arm64: linker: move data section between rodata
and bss") moved .data up a little too far. Keep app_smem in front of it
otherwise user memory partitions end up in general .data with no user
permissions.

Signed-off-by: Nicolas Pitre <npitre@baylibre.com>
This commit is contained in:
Nicolas Pitre 2024-09-04 11:01:42 -04:00 committed by Carles Cufí
parent 652839aee0
commit ef30aa8626
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
include/zephyr/arch/arm64/scripts/linker.ld
View file

@ -218,25 +218,6 @@ SECTIONS
z_mapped_start = .; z_mapped_start = .;
#endif #endif
__data_region_start = .;
SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,)
{
MMU_ALIGN;
__data_start = .;
*(.data)
*(".data.*")
*(".kernel.*")
#include <snippets-rwdata.ld>
__data_end = .;
} GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
__data_size = __data_end - __data_start;
__data_load_start = LOADADDR(_DATA_SECTION_NAME);
#include <snippets-ram-sections.ld>
#if defined(CONFIG_USERSPACE) #if defined(CONFIG_USERSPACE)
#define APP_SHARED_ALIGN . = ALIGN(_region_min_align); #define APP_SHARED_ALIGN . = ALIGN(_region_min_align);
#define SMEM_PARTITION_ALIGN(size) MMU_ALIGN #define SMEM_PARTITION_ALIGN(size) MMU_ALIGN
@ -257,6 +238,25 @@ SECTIONS
_app_smem_rom_start = LOADADDR(_APP_SMEM_SECTION_NAME); _app_smem_rom_start = LOADADDR(_APP_SMEM_SECTION_NAME);
#endif /* CONFIG_USERSPACE */ #endif /* CONFIG_USERSPACE */
__data_region_start = .;
SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,)
{
MMU_ALIGN;
__data_start = .;
*(.data)
*(".data.*")
*(".kernel.*")
#include <snippets-rwdata.ld>
__data_end = .;
} GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
__data_size = __data_end - __data_start;
__data_load_start = LOADADDR(_DATA_SECTION_NAME);
#include <snippets-ram-sections.ld>
#include <zephyr/linker/common-ram.ld> #include <zephyr/linker/common-ram.ld>
#include <zephyr/linker/kobject-data.ld> #include <zephyr/linker/kobject-data.ld>
#include <zephyr/linker/cplusplus-ram.ld> #include <zephyr/linker/cplusplus-ram.ld>