Skip to content

Commit 81e7f6b

Browse files
platform: imx93_a55: handle linker additions at SOF level
SOF requires some additions to the Zephyr linker script. This should be handled inside SOF instead of Zephyr. Since 8f33d9dc8498 ("soc: imx93: remove custom linker script") removes the custom linker script from Zephyr, this means the custom SOF linker sections will have to be handled on SOF side. This also includes a Zephyr hash bump to 3f2790b89ca5, which brings the following (potentially) relevant patches: 3f2790b89ca5 soc: imx93: remove custom linker script d389c95935c5 soc: intel_adsp: ace: Configurable SRAM retention mode and cleanup be041b14fe51 Intel: ADSP: move HPSRAM mask into assembly Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
1 parent 7dd2d7f commit 81e7f6b

File tree

4 files changed

+27
-1
lines changed

4 files changed

+27
-1
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
SECTION_PROLOGUE(.static_uuid_entries,,)
2+
{
3+
*(*.static_uuids)
4+
} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
5+
6+
SECTION_PROLOGUE(.static_log_entries,,)
7+
{
8+
*(*.static_log*)
9+
} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
10+
11+
SECTION_PROLOGUE(.fw_metadata,,)
12+
{
13+
KEEP (*(*.fw_metadata))
14+
. = ALIGN(16);
15+
} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
_trace_ctx_start = ABSOLUTE(.);
2+
*(.trace_ctx)
3+
_trace_ctx_end = ABSOLUTE(.);

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ manifest:
4343

4444
- name: zephyr
4545
repo-path: zephyr
46-
revision: 689d1edee1d57f052b1d4572d67618c0b0e2b8a4
46+
revision: 3f2790b89ca54ec2fb7854fd5242c2c3f04b6372
4747
remote: zephyrproject
4848

4949
# Import some projects listed in zephyr/west.yml@revision

zephyr/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,14 @@ if (CONFIG_SOC_MIMX9352_A55)
393393
${SOF_SRC_PATH}/schedule/zephyr_ll.c
394394
)
395395

396+
# SOF-specific linker script additions
397+
zephyr_linker_sources(RWDATA
398+
${sof_top_dir}/src/platform/imx93_a55/linker/rwdata.ld
399+
)
400+
zephyr_linker_sources(DATA_SECTIONS
401+
${sof_top_dir}/src/platform/imx93_a55/linker/data-sections.ld
402+
)
403+
396404
set(PLATFORM "imx93_a55")
397405
endif()
398406

0 commit comments

Comments
 (0)