From dceb9a60e66876f55e49ce5b8f6b8e8205e820a5 Mon Sep 17 00:00:00 2001 From: Andy Ross Date: Sat, 8 Feb 2025 06:18:21 -0800 Subject: [PATCH 1/2] drivers/mediatek: Fix build warning The "group" variable is set but unused, causing a -Werror build failure with Zephyr. Signed-off-by: Andy Ross --- src/drivers/mediatek/mt8196/intc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/drivers/mediatek/mt8196/intc.c b/src/drivers/mediatek/mt8196/intc.c index ded339be8b90..472d6ad8e7d7 100644 --- a/src/drivers/mediatek/mt8196/intc.c +++ b/src/drivers/mediatek/mt8196/intc.c @@ -52,11 +52,10 @@ void intc_init(void) void intc_irq_unmask(enum IRQn_Type irq) { - uint32_t word, group; + uint32_t word; if (irq < IRQ_MAX_CHANNEL && intc_desc.irqs[irq].group < INTC_GRP_NUM) { word = INTC_WORD(irq); - group = intc_desc.irqs[irq].group; io_reg_update_bits(INTC_IRQ_EN(word), INTC_BIT(irq), INTC_BIT(irq)); } else { tr_err(&intc_tr, "Invalid INTC interrupt %d", irq); From 41430f748433bc74c83e1e84b8e431f0cd1e5c3c Mon Sep 17 00:00:00 2001 From: Andy Ross Date: Sat, 8 Feb 2025 06:19:53 -0800 Subject: [PATCH 2/2] zephyr/cmake: Clean up Waves codec integration Include the proprietary static library when not building the stub, do a little reorganization of the cmake code to reduce duplication and clarify things a bit. Maybe. CMake code doesn't clean up very well. Signed-off-by: Andy Ross --- zephyr/CMakeLists.txt | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index ed4f7e904d2e..2fd99e339f71 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -1141,17 +1141,21 @@ elseif(CONFIG_DTS_CODEC) endif() endif() -if(CONFIG_WAVES_CODEC STREQUAL "m") - add_subdirectory(${SOF_AUDIO_PATH}/module_adapter/module/waves/llext - ${PROJECT_BINARY_DIR}/waves_llext) - add_dependencies(app waves) -elseif(CONFIG_WAVES_CODEC) - zephyr_library_sources( - ${SOF_AUDIO_PATH}/module_adapter/module/waves/waves.c - ) - zephyr_library_sources_ifdef(CONFIG_WAVES_CODEC_STUB - ${SOF_AUDIO_PATH}/module_adapter/module/waves/maxx_stub.c - ) +if(CONFIG_WAVES_CODEC) + set(WAVES_DIR ${SOF_AUDIO_PATH}/module_adapter/module/waves) + if(CONFIG_WAVES_CODEC STREQUAL "m") + add_subdirectory(${WAVES_DIR}/llext ${PROJECT_BINARY_DIR}/waves_llext) + add_dependencies(app waves) + else() + zephyr_library_sources(${WAVES_DIR}/waves.c) + if(CONFIG_WAVES_CODEC_STUB) + zephyr_library_sources_ifdef(CONFIG_WAVES_CODEC_STUB + ${WAVES_DIR}/maxx_stub.c) + else() + zephyr_library_import(waves_codec + ${sof_top_dir}/third_party/lib/libMaxxChrome.a) + endif() + endif() endif() if(CONFIG_PROBE STREQUAL "m")