Skip to content

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

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

Merged
lgirdwood merged 2 commits into from
Feb 11, 2022
Merged

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

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
82582f1
zephyr: add copier and base_fw components
Feb 11, 2022
e9f66c5
audio: force pcm_converter_generic for IPC4 with zephyr
Feb 11, 2022
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: 4 additions & 0 deletions src/include/sof/audio/pcm_converter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ struct audio_stream;

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

@lgirdwood lgirdwood Feb 11, 2022

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.

#define PCM_CONVERTER_GENERIC
#else
#define PCM_CONVERTER_HIFI3
#endif
#else
#define PCM_CONVERTER_GENERIC
#endif
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 @@ -685,6 +685,14 @@ zephyr_library_sources_ifdef(CONFIG_COMP_SRC
${SOF_AUDIO_PATH}/src/src.c
)

zephyr_library_sources_ifdef(CONFIG_COMP_BASEFW_IPC4
${SOF_AUDIO_PATH}/base_fw.c
)

zephyr_library_sources_ifdef(CONFIG_COMP_COPIER
${SOF_AUDIO_PATH}/copier.c
)

zephyr_library_sources_ifdef(CONFIG_SAMPLE_SMART_AMP
${SOF_SAMPLES_PATH}/audio/smart_amp_test.c
)
Expand Down
10 changes: 10 additions & 0 deletions zephyr/wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,8 @@ void sys_comp_dcblock_init(void);
void sys_comp_eq_iir_init(void);
void sys_comp_kpb_init(void);
void sys_comp_smart_amp_init(void);
void sys_comp_basefw_init(void);
void sys_comp_copier_init(void);

/* Zephyr redefines log_message() and mtrace_printf() which leaves
* totally empty the .static_log_entries ELF sections for the
Expand Down Expand Up @@ -630,6 +632,14 @@ int task_main_start(struct sof *sof)
sys_comp_mux_init();
}

if (IS_ENABLED(CONFIG_COMP_BASEFW_IPC4)) {
sys_comp_basefw_init();
}

if (IS_ENABLED(CONFIG_COMP_COPIER)) {
sys_comp_copier_init();
}

/* init pipeline position offsets */
pipeline_posn_init(sof);

Expand Down