Skip to content

[DNM][DNR] Test windows CI breakage fix #9469

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

Closed
LaurentiuM1234 wants to merge 2 commits into from
Closed

[DNM][DNR] Test windows CI breakage fix #9469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54ad8d1
platform: imx93_a55: handle linker additions at SOF level
LaurentiuM1234 Aug 19, 2024
e598fea
.github/zephyr: switch to python 3.10 on windows
LaurentiuM1234 Sep 12, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/zephyr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: '3.8'
python-version: '3.10'

- name: West install
run: pip3 install west
Expand All @@ -329,7 +329,7 @@ jobs:
uses: actions/setup-python@v5
id: cache-python
with:
python-version: '3.8'
python-version: '3.10'
cache: 'pip'
cache-dependency-path: workspace/zephyr/scripts/requirements.txt

Expand Down
15 changes: 15 additions & 0 deletions src/platform/imx93_a55/linker/data-sections.ld
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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: 3f2790b89ca54ec2fb7854fd5242c2c3f04b6372
remote: zephyrproject

# Import some projects listed in zephyr/west.yml@revision
Expand Down
8 changes: 8 additions & 0 deletions zephyr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,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