Skip to content

Commit 65292df

Browse files
committed
Remove double map check
1 parent 8e7922d commit 65292df

2 files changed

Lines changed: 2 additions & 5 deletions

File tree

src/audio/module_adapter/library/userspace_proxy.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,7 @@ static int userspace_proxy_memory_init(struct userspace_context *user_ctx,
276276
tr_dbg(&userspace_proxy_tr, "Heap partition %#lx + %zx, attr = %u",
277277
heap_part.start, heap_part.size, heap_part.attr);
278278

279-
#if !defined(CONFIG_XTENSA_MMU_DOUBLE_MAP) && defined(CONFIG_SOF_ZEPHYR_HEAP_CACHED)
280-
#define HEAP_PART_CACHED
279+
#if defined(CONFIG_SOF_ZEPHYR_HEAP_CACHED)
281280
/* Add cached module private heap to memory partitions */
282281
struct k_mem_partition heap_cached_part = {
283282
.attr = K_MEM_PARTITION_P_RW_U_RW | XTENSA_MMU_CACHED_WB
@@ -296,7 +295,7 @@ static int userspace_proxy_memory_init(struct userspace_context *user_ctx,
296295
* These include ops structures marked with APP_TASK_DATA.
297296
*/
298297
&common_partition,
299-
#ifdef HEAP_PART_CACHED
298+
#ifdef CONFIG_SOF_ZEPHYR_HEAP_CACHED
300299
&heap_cached_part,
301300
#endif
302301
&heap_part

zephyr/lib/userspace_helper.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
#include <sof/lib/dai.h>
2424
#include <sof/lib/dma.h>
2525

26-
#define MODULE_DRIVER_HEAP_CACHED CONFIG_SOF_ZEPHYR_HEAP_CACHED
27-
2826
/* Zephyr includes */
2927
#include <zephyr/kernel.h>
3028
#include <zephyr/app_memory/app_memdomain.h>

0 commit comments

Comments
 (0)