Skip to content

Commit

Permalink
platform: imx93_a55: handle linker additions at SOF level
Browse files Browse the repository at this point in the history
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 pull/77228/head
to pull in the following commits:

8f33d9dc8498 soc: imx93: remove custom linker script

Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
  • Loading branch information
LaurentiuM1234 committed Sep 9, 2024
1 parent 0df649a commit 0189239
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 1 deletion.
15 changes: 15 additions & 0 deletions src/platform/imx93_a55/linker/data-sections.ld
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
SECTION_PROLOGUE(.static_uuid_entries,,)
{
*(*.static_uuids)
} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)

SECTION_PROLOGUE(.static_log_entries,,)
{
*(*.static_log*)
} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)

SECTION_PROLOGUE(.fw_metadata,,)
{
KEEP (*(*.fw_metadata))
. = ALIGN(16);
} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
3 changes: 3 additions & 0 deletions src/platform/imx93_a55/linker/rwdata.ld
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
_trace_ctx_start = ABSOLUTE(.);
*(.trace_ctx)
_trace_ctx_end = ABSOLUTE(.);
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ manifest:

- name: zephyr
repo-path: zephyr
revision: 689d1edee1d57f052b1d4572d67618c0b0e2b8a4
revision: pull/77228/head
remote: zephyrproject

# Import some projects listed in zephyr/west.yml@revision
Expand Down
8 changes: 8 additions & 0 deletions zephyr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,14 @@ if (CONFIG_SOC_MIMX9352_A55)
${SOF_SRC_PATH}/schedule/zephyr_ll.c
)

# SOF-specific linker script additions
zephyr_linker_sources(RWDATA
${sof_top_dir}/src/platform/imx93_a55/linker/rwdata.ld
)
zephyr_linker_sources(DATA_SECTIONS
${sof_top_dir}/src/platform/imx93_a55/linker/data-sections.ld
)

set(PLATFORM "imx93_a55")
endif()

Expand Down

0 comments on commit 0189239

Please sign in to comment.