Skip to content
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

Jump to bottom

zephyr: sof/lib/mm_heap.h added Zephyr version #9467

Merged
merged 2 commits into from
Sep 19, 2024
Merged

zephyr: sof/lib/mm_heap.h added Zephyr version #9467

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
49a8c3d
zephyr: imx: drop linking to platform/memory.c
kv2019i Sep 18, 2024
b643d10
zephyr: sof/lib/mm_heap.h added Zephyr version
kv2019i 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: 4 additions & 0 deletions xtos/include/sof/lib/mm_heap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
#ifndef __SOF_LIB_MM_HEAP_H__
#define __SOF_LIB_MM_HEAP_H__

#ifdef __ZEPHYR__
#error "Please use zephyr/include/sof/lib/mm_heap.h instead"
#endif

#include <sof/common.h>
#include <rtos/alloc.h>
#include <rtos/cache.h>
Expand Down
3 changes: 0 additions & 3 deletions zephyr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ if (CONFIG_SOC_MIMX8QM6_ADSP OR CONFIG_SOC_MIMX8QX6_ADSP)
zephyr_library_sources(
${SOF_PLATFORM_PATH}/imx8/platform.c
${SOF_PLATFORM_PATH}/imx8/lib/clk.c
${SOF_PLATFORM_PATH}/imx8/lib/memory.c
)

# SOF core infrastructure - runs on top of Zephyr
Expand All @@ -339,7 +338,6 @@ if (CONFIG_SOC_MIMX8ML8_ADSP)
zephyr_library_sources(
${SOF_PLATFORM_PATH}/imx8m/platform.c
${SOF_PLATFORM_PATH}/imx8m/lib/clk.c
${SOF_PLATFORM_PATH}/imx8m/lib/memory.c
${SOF_PLATFORM_PATH}/imx8m/lib/dai.c
${SOF_PLATFORM_PATH}/imx8m/lib/dma.c
)
Expand All @@ -363,7 +361,6 @@ if (CONFIG_SOC_MIMX8UD7_ADSP)
zephyr_library_sources(
${SOF_PLATFORM_PATH}/imx8ulp/platform.c
${SOF_PLATFORM_PATH}/imx8ulp/lib/clk.c
${SOF_PLATFORM_PATH}/imx8ulp/lib/memory.c
)

# SOF core infrastructure - runs on top of Zephyr
Expand Down
11 changes: 11 additions & 0 deletions zephyr/include/sof/lib/mm_heap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/* SPDX-License-Identifier: BSD-3-Clause
*
* Copyright(c) 2024 Intel Corporation.
*/

#ifndef __SOF_LIB_MM_HEAP_H__
#define __SOF_LIB_MM_HEAP_H__

/* no-op on Zephyr */

#endif /* __SOF_LIB_MM_HEAP_H__ */