From b643d1005b3d5a4d339309856c0c9b4f034b3ed5 Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Thu, 12 Sep 2024 14:09:08 +0300
Subject: [PATCH] zephyr: sof/lib/mm_heap.h added Zephyr version

Definitions of mm_heap.h interface are not needed in Zephyr builds. To
avoid pulling in XTOS definitions when building with
CONFIG_SOF_ZEPHYR_STRICT_HEADERS=n, add a no-op version for Zephyr.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
---
 xtos/include/sof/lib/mm_heap.h   |  4 ++++
 zephyr/include/sof/lib/mm_heap.h | 11 +++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 zephyr/include/sof/lib/mm_heap.h

diff --git a/xtos/include/sof/lib/mm_heap.h b/xtos/include/sof/lib/mm_heap.h
index 7bdab176eb5f..931a66ed0cea 100644
--- a/xtos/include/sof/lib/mm_heap.h
+++ b/xtos/include/sof/lib/mm_heap.h
@@ -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>
diff --git a/zephyr/include/sof/lib/mm_heap.h b/zephyr/include/sof/lib/mm_heap.h
new file mode 100644
index 000000000000..634b336d9e40
--- /dev/null
+++ b/zephyr/include/sof/lib/mm_heap.h
@@ -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__ */