Skip to content

arch: aarch32: linker command file fixes: .bss/.noinit sections, z_mapped_start marker #60368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 9, 2023
Merged

arch: aarch32: linker command file fixes: .bss/.noinit sections, z_mapped_start marker #60368

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07711cb
arch: aarch32: place .bss, .noinit sections at the end of the binary
ibirnbaum Jul 13, 2023
9b4fede
arch: aarch32: fix z_mapped_start location for non-XIP operation
ibirnbaum Aug 7, 2023
d8545f4
doc: release-notes: document aarch32 cortex_a_r linker command file c…
ibirnbaum Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 32 additions & 35 deletions include/zephyr/arch/arm/aarch32/cortex_a_r/scripts/linker.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@
#endif
#define RAMABLE_REGION RAM

/* section alignment directive, valid only if not running in XIP mode */
#ifndef CONFIG_XIP
#define SECTION_ALIGN ALIGN(_region_min_align)
#else
#define SECTION_ALIGN
#endif

#if !defined(CONFIG_XIP) && (CONFIG_FLASH_SIZE == 0)
#define ROM_ADDR RAM_ADDR
#else
Expand Down Expand Up @@ -73,8 +80,6 @@ _region_min_align = 4;
. = ALIGN(_region_min_align)
#endif

#define BSS_ALIGN ALIGN(_region_min_align)

MEMORY
{
FLASH (rx) : ORIGIN = ROM_ADDR, LENGTH = ROM_SIZE
Expand Down Expand Up @@ -133,9 +138,6 @@ SECTIONS
{
. = ALIGN(_region_min_align);
__text_region_start = .;
#ifndef CONFIG_XIP
z_mapped_start = .;
#endif

#include <zephyr/linker/kobject-text.ld>

Expand Down Expand Up @@ -247,9 +249,7 @@ SECTIONS
*/
. = ALIGN(_region_min_align);
_image_ram_start = .;
#ifdef CONFIG_XIP
z_mapped_start = .;
#endif

/* Located in generated directory. This file is populated by the
* zephyr_linker_sources() Cmake function.
Expand All @@ -266,35 +266,10 @@ SECTIONS
_app_smem_rom_start = LOADADDR(_APP_SMEM_SECTION_NAME);
#endif /* CONFIG_USERSPACE */

SECTION_DATA_PROLOGUE(_BSS_SECTION_NAME,(NOLOAD), BSS_ALIGN)
{
/*
* For performance, BSS section is assumed to be 4 byte aligned and
* a multiple of 4 bytes
*/
. = ALIGN(4);
__bss_start = .;
__kernel_ram_start = .;

*(.bss)
*(".bss.*")
*(COMMON)
*(".kernel_bss.*")

#ifdef CONFIG_CODE_DATA_RELOCATION
#include <linker_sram_bss_relocate.ld>
#endif

/*
* As memory is cleared in words only, it is simpler to ensure the BSS
* section ends on a 4 byte boundary. This wastes a maximum of 3 bytes.
*/
__bss_end = ALIGN(4);
} GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)

#include <zephyr/linker/common-noinit.ld>
. = ALIGN(_region_min_align);
__kernel_ram_start = .;

SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,)
SECTION_DATA_PROLOGUE(_DATA_SECTION_NAME,,SECTION_ALIGN)
{
__data_region_start = .;
__data_start = .;
Expand Down Expand Up @@ -328,7 +303,29 @@ SECTIONS
#include <snippets-data-sections.ld>

__data_region_end = .;
. = ALIGN(_region_min_align);

SECTION_DATA_PROLOGUE(_BSS_SECTION_NAME,(NOLOAD), SECTION_ALIGN)
{
__bss_start = .;

*(.bss)
*(".bss.*")
*(COMMON)
*(".kernel_bss.*")

#ifdef CONFIG_CODE_DATA_RELOCATION
#include <linker_sram_bss_relocate.ld>
#endif

/*
* As memory is cleared in words only, it is simpler to ensure the BSS
* section ends on a 4 byte boundary. This wastes a maximum of 3 bytes.
*/
__bss_end = ALIGN(4);
} GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)

#include <zephyr/linker/common-noinit.ld>

/* Define linker symbols */

Expand Down