Include echo reference patches in ptl-007 branch

src/arch/host/configs/library_defconfig

@@ -21,6 +21,7 @@ CONFIG_COMP_SRC=y
 CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
 CONFIG_COMP_STUBS=y
 CONFIG_COMP_TDFB=y
+CONFIG_COMP_TONE=y
 CONFIG_COMP_VOLUME=y
 CONFIG_COMP_VOLUME_LINEAR_RAMP=y
 CONFIG_COMP_VOLUME_WINDOWS_FADE=y

src/audio/CMakeLists.txt

@@ -121,9 +121,7 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 		add_subdirectory(mic_privacy_manager)
 	endif()
 	if(CONFIG_COMP_TONE)
-		add_local_sources(sof
-			tone.c
-		)
+		add_subdirectory(tone)
 	endif()
 	if(CONFIG_ZEPHYR_NATIVE_DRIVERS)
 		list(APPEND base_files host-zephyr.c)

src/audio/Kconfig

@@ -93,13 +93,6 @@ config COMP_STUBS
 	  Select to force all 3P blocks to link against stubs rather than their libraries. This
 	  should only be used in testing environments like fuzzers or CI.
 
-config COMP_TONE
-	bool "Tone component"
-	select CORDIC_FIXED
-	help
-	  Select for Tone component.
-	  Warning: This component is deprecated and will be removed from SOF v2.8.
-
 config COMP_KPB
 	bool "KPB component"
 	default y
@@ -154,6 +147,7 @@ rsource "src/Kconfig"
 rsource "tdfb/Kconfig"
 rsource "template/Kconfig"
 rsource "tensorflow/Kconfig"
+rsource "tone/Kconfig"
 rsource "up_down_mixer/Kconfig"
 rsource "volume/Kconfig"
 # --- End Kconfig Sources (alphabetical order) ---

src/audio/tone/CMakeLists.txt

@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: BSD-3-Clause
+
+if(CONFIG_COMP_TONE STREQUAL "m" AND DEFINED CONFIG_LLEXT)
+  add_subdirectory(llext ${PROJECT_BINARY_DIR}/tone_llext)
+  add_dependencies(app tone)
+else()
+  if(CONFIG_IPC_MAJOR_3)
+    add_local_sources(sof tone.c tone-ipc3.c)
+  elseif(CONFIG_IPC_MAJOR_4)
+    add_local_sources(sof tone.c tone-ipc4.c)
+  endif()
+endif()

src/audio/tone/Kconfig

@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: BSD-3-Clause
+
+config COMP_TONE
+	tristate "Tone component"
+	default m if LIBRARY_DEFAULT_MODULAR
+	default y
+	depends on COMP_MODULE_ADAPTER
+	depends on IPC_MAJOR_4
+	select CORDIC_FIXED
+	help
+	  Select for Tone component. This component is used to generate
+	  audio tones (sine waves) at specified frequencies when the Tone
+	  mode is enabled. The two other modes it supports are silence where
+	  it generates 0s and passthrough where the input is passed to the
+	  output. Warning: This component is untested with IPC_MAJOR_3 and
+	  is unavailable.

src/audio/tone/llext/CMakeLists.txt

@@ -0,0 +1,7 @@
+# Copyright (c) 2025 Intel Corporation.
+# SPDX-License-Identifier: Apache-2.0
+
+sof_llext_build("tone"
+	SOURCES ../tone.c ../tone-ipc4.c
+	LIB openmodules
+)

src/audio/tone/llext/llext.toml.h

@@ -0,0 +1,6 @@
+#include <tools/rimage/config/platform.toml>
+#define LOAD_TYPE "2"
+#include "../tone.toml"
+
+[module]
+count = __COUNTER__