michaelh/zephyr
1
0
Fork 0
Code Releases Activity

subsys: app_memory: Fixed the build issue wrt ARC.

Browse source 
The linker script is updated to support the new method of size
calculation.

Signed-off-by: Adithya Baglody <adithya.nagaraj.baglody@intel.com>
This commit is contained in:
Adithya Baglody 2018-09-21 10:17:58 +05:30 • committed by Anas Nashif
commit 10c6a0c1aa
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/arch/arc/v2/linker.ld
View file

@ -128,22 +128,28 @@ SECTIONS {
GROUP_START(RAMABLE_REGION) GROUP_START(RAMABLE_REGION)
#include <app_data_alignment.ld> #include <app_data_alignment.ld>
#if defined(CONFIG_APP_SHARED_MEM)
#if defined(CONFIG_MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT)
#define APP_SHARED_ALIGN MPU_MIN_SIZE_ALIGN
#include <app_smem.ld>
#else
SECTION_PROLOGUE(_APP_SMEM_SECTION_NAME, (OPTIONAL),) SECTION_PROLOGUE(_APP_SMEM_SECTION_NAME, (OPTIONAL),)
{ {
MPU_MIN_SIZE_ALIGN MPU_MIN_SIZE_ALIGN
_image_ram_start = .; _image_ram_start = .;
_app_smem_start = .; _app_smem_start = .;
#if defined(CONFIG_MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT)
#include <app_smem.ld>
#else
APP_SMEM_SECTION() APP_SMEM_SECTION()
#endif
MPU_MIN_SIZE_ALIGN MPU_MIN_SIZE_ALIGN
_app_smem_end = .; _app_smem_end = .;
} GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION) } GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
#endif /* CONFIG_MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT */
_app_smem_size = _app_smem_end - _app_smem_start; _app_smem_size = _app_smem_end - _app_smem_start;
_app_smem_rom_start = LOADADDR(_APP_SMEM_SECTION_NAME); _app_smem_rom_start = LOADADDR(_APP_SMEM_SECTION_NAME);
#endif /* CONFIG_APP_SHARED_MEM */
#ifdef CONFIG_APPLICATION_MEMORY #ifdef CONFIG_APPLICATION_MEMORY
SECTION_DATA_PROLOGUE(_APP_DATA_SECTION_NAME, (OPTIONAL),) SECTION_DATA_PROLOGUE(_APP_DATA_SECTION_NAME, (OPTIONAL),)
{ {

5
scripts/gen_app_partitions.py
View file

@ -22,15 +22,14 @@ print_template = """
linker_start_seq = """ linker_start_seq = """
SECTION_PROLOGUE(_APP_SMEM_SECTION_NAME, (OPTIONAL),) SECTION_PROLOGUE(_APP_SMEM_SECTION_NAME, (OPTIONAL),)
{ {
. = ALIGN(4); APP_SHARED_ALIGN;
_image_ram_start = .; _image_ram_start = .;
_app_smem_start = .; _app_smem_start = .;
""" """
linker_end_seq = """ linker_end_seq = """
_app_smem_end = .; _app_smem_end = .;
_app_smem_size = _app_smem_end - _app_smem_start; APP_SHARED_ALIGN;
. = ALIGN(4);
} GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION) } GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
""" """