Skip to content

zephyr: add support to build SOF with IPC4 and zephyr - #5344

Merged
lgirdwood merged 2 commits into
thesofproject:mainfrom
aiChaoSONG:zephyr_ipc4
Feb 11, 2022
Merged

lgirdwood merged 2 commits into
thesofproject:mainfrom
aiChaoSONG:zephyr_ipc4

Conversation

@aiChaoSONG

@aiChaoSONG aiChaoSONG commented Feb 11, 2022 •

Copy link
Copy Markdown
Collaborator

Two commits:

  1. add copier and base_fw components
  2. force the use of pcm_converter_generic if build with zephyr+ipc4, because the conversion code used by copier is not implemented in HIFI3 yet.

The two components copier and base_fw are
essential to IPC4 support on SOF on Zephyr.

This patch integrates the build of the two
components to SOF build with zephyr RTOS.

Signed-off-by: Chao Song <chao.song@linux.intel.com>
@aiChaoSONG
aiChaoSONG requested review from kv2019i and lyakh February 11, 2022 02:02
@aiChaoSONG aiChaoSONG changed the title zephyr: add copier and base_fw components zephyr: add support to build SOF with IPC4 and zephyr Feb 11, 2022
@aiChaoSONG
aiChaoSONG marked this pull request as draft February 11, 2022 05:11
The copier component depends on special pcm conversion
code, which is only implemented in the generic pcm
converter. If we build SOF with IPC4 support with XCC,
the HIFI3 pcm converter is selected automatically, and
causes the issue of
    undefined reference to `pcm_func_vc_count'
    undefined reference to `pcm_func_vc_map'.

This patch forces the use of generic pcm converter
if build SOF with IPC4 and Zephyr.

This patch should be reverted once the HIFI3 pcm converter
counterpart is implemented.

Signed-off-by: Chao Song <chao.song@linux.intel.com>
@aiChaoSONG
aiChaoSONG marked this pull request as ready for review February 11, 2022 05:19

#ifndef UNIT_TEST
#if __XCC__ && XCHAL_HAVE_HIFI3 && CONFIG_FORMAT_CONVERT_HIFI3
#if __ZEPHYR__ && CONFIG_IPC_MAJOR_4

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@singalsu @andrula-song fyi - can someone check what's needed here.

@lgirdwood
lgirdwood merged commit bf191f6 into thesofproject:main Feb 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants