michaelh/zephyr
1
0
Fork 0
Code Releases Activity

aarch64: Rework linker script for better MMU support

Browse source 
In acda9bf9ce new macros were introduced to support a virtual memory
map. Adjust these macros also for AArch64. This also fixes a problem
when building Zephyr when CONFIG_KERNEL_VM_BASE is not the same as
CONFIG_SRAM_BASE_ADDRESS

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
This commit is contained in:
Carlo Caione 2021-03-23 11:53:21 +01:00 • committed by Anas Nashif
commit d4066dae83
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/arch/arm/aarch64/scripts/linker.ld
View file

@ -123,7 +123,7 @@ SECTIONS
#include <linker/kobject-text.ld>
MMU_ALIGN;
} GROUP_LINK_IN(ROMABLE_REGION)
} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
_image_text_end = .;
_image_text_size = _image_text_end - _image_text_start;
@ -135,7 +135,7 @@ SECTIONS
* .ARM.extab section containing exception unwinding information.
*/
*(.ARM.extab* .gnu.linkonce.armextab.*)
} GROUP_LINK_IN(ROMABLE_REGION)
} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
#endif
SECTION_PROLOGUE(.ARM.exidx,,)
@ -151,7 +151,7 @@ SECTIONS
*(.ARM.exidx* gnu.linkonce.armexidx.*)
#endif
__exidx_end = .;
} GROUP_LINK_IN(ROMABLE_REGION)
} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
_image_rodata_start = .;
@ -173,7 +173,7 @@ SECTIONS
#include <linker/kobject-rom.ld>
} GROUP_LINK_IN(ROMABLE_REGION)
} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
#include <linker/cplusplus-rom.ld>
MMU_ALIGN;
@ -243,7 +243,7 @@ SECTIONS
* 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)
} GROUP_NOLOAD_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
#include <linker/common-noinit.ld>
@ -301,7 +301,7 @@ SECTIONS
/* Must be last in romable region */
SECTION_PROLOGUE(.last_section,(NOLOAD),)
{
} GROUP_LINK_IN(ROMABLE_REGION)
} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
/* To provide the image size as a const expression,
* calculate this value here. */