Merge branch 'thesofproject:main' into main

Author: Prjbond007

app/boards/intel_adsp_ace30_ptl.conf

@@ -7,12 +7,8 @@ CONFIG_IPC4_BASE_FW_INTEL=y
 
 # SOF / audio pipeline and module settings
 CONFIG_MM_DRV=y
-CONFIG_COMP_ARIA=m
 CONFIG_COMP_CHAIN_DMA=y
-CONFIG_COMP_DRC=m
 CONFIG_COMP_KPB=y
-CONFIG_COMP_CROSSOVER=m
-CONFIG_COMP_MULTIBAND_DRC=m
 CONFIG_COMP_TESTER=m
 CONFIG_COMP_SRC_IPC4_FULL_MATRIX=y
 CONFIG_COMP_UP_DOWN_MIXER=y

scripts/gen-doc.sh

@@ -6,8 +6,25 @@
 # According to instructions:
 # https://thesofproject.github.io/latest/howtos/process/docbuild.html
 
-# fail immediately on any errors
-set -e
+# this needs to run from the Zephyr python virtual environment
+# so that the python packages are available (and more up to date than
+# the system packages).
+
+# check if Zephyr environment is set up
+if [ ! -z "$ZEPHYR_BASE" ]; then
+    VENV_DIR="$ZEPHYR_BASE/.venv"
+    echo "Using Zephyr environment at $ZEPHYR_BASE"
+elif [ ! -z "$SOF_WORKSPACE" ]; then
+    VENV_DIR="$SOF_WORKSPACE/zephyr/.venv"
+    echo "Using SOF/Zephyr environment at $SOF_WORKSPACE"
+else
+    # fallback to the zephyr default from the getting started guide
+    VENV_DIR="$HOME/zephyrproject/.venv"
+    echo "Using default Zephyr environment at $VENV_DIR"
+fi
+
+# start the virtual environment
+source ${VENV_DIR}/bin/activate
 
 function print_usage()
 {
@@ -21,11 +38,11 @@ function print_usage()
 # make it runnable from any location
 # user shouldn't be confused from which dir this script has to be run
 SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
-
 # expected paths of repositories needed for documentation process
 SOF_REPO=$(dirname "$SCRIPT_DIR")
 DOCS_REPO="$(dirname "$SOF_REPO")/sof-docs"
 PUBLISH_REPO="$(dirname "$SOF_REPO")/thesofproject.github.io"
+BUILD_DIR="$(dirname "$SOF_REPO")/build-sof-docs"
 
 # parse arguments
 DO_BUILD=false
@@ -73,20 +90,19 @@ then
 	fi
 fi
 
-cd "$SOF_REPO/doc"
-
 if "$DO_CLEAN"
 then
 	echo "Cleaning $SOF_REPO"
-	cmake .
+	cd ${BUILD_DIR}
 	make clean
 	make doc-clean
 fi
 
 if "$DO_BUILD"
 then
 	echo "Building $SOF_REPO"
-	cmake .
+	cd "$SOF_REPO/doc"
+	cmake -S . -B ${BUILD_DIR}
 	make doc
 fi
 
@@ -133,3 +149,6 @@ then
 	cd "$DOCS_REPO"
 	make publish
 fi
+
+# cleanup
+deactivate

scripts/vscode-task.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2025 Intel Corporation. All rights reserved.
+
+# Simple helper script for vscode task support.
+# Current vscode tasks have difficulty executing multiple commands.
+
+# check if Zephyr environment is set up
+if [ ! -z "$ZEPHYR_BASE" ]; then
+    VENV_DIR="$ZEPHYR_BASE/.venv"
+    echo "Using Zephyr environment at $ZEPHYR_BASE"
+elif [ ! -z "$SOF_WORKSPACE" ]; then
+    VENV_DIR="$SOF_WORKSPACE/zephyr/.venv"
+    echo "Using SOF/Zephyr environment at $SOF_WORKSPACE"
+else
+    # fallback to the zephyr default from the getting started guide
+    VENV_DIR="$HOME/zephyrproject/.venv"
+    echo "Using default Zephyr environment at $VENV_DIR"
+fi
+
+# start the virtual environment
+source ${VENV_DIR}/bin/activate
+
+# The vscode workspace is the parent directory of the SOF Firmware directory
+# we need to cd into sof to run the zephyr build script
+cd sof
+
+# run the zephyr script
+./scripts/xtensa-build-zephyr.py "$@"
+
+# cleanup
+deactivate

scripts/xtensa-build-zephyr.py

@@ -372,6 +372,8 @@ def parse_args():
 			    help="""Do not create a tar file of the installed firmware files under build-sof-staging.""")
 	parser.add_argument("--version", required=False, action="store_true",
 			    help="Prints version of this script.")
+	parser.add_argument("-m", "--menuconfig", required=False, action="store_true",
+				help="Build menuconfig for target")
 
 	args = parser.parse_args()
 
@@ -854,7 +856,10 @@ def build_platforms():
 		PLAT_CONFIG = platform_dict["PLAT_CONFIG"]
 		build_cmd = ["west"]
 		build_cmd += ["-v"] * args.verbose
-		build_cmd += ["build", "--build-dir", platform_build_dir_name]
+		if args.menuconfig:
+			build_cmd += ["build", "-t", "menuconfig", "--build-dir", platform_build_dir_name]
+		else:
+			build_cmd += ["build", "--build-dir", platform_build_dir_name]
 		source_dir = pathlib.Path(SOF_TOP, "app")
 		build_cmd += ["--board", PLAT_CONFIG, str(source_dir)]
 		if args.pristine:
@@ -917,6 +922,10 @@ def build_platforms():
 			else: # unknown failure
 				raise cpe
 
+		# no output to display if building menuconfig
+		if args.menuconfig:
+			return
+
 		# reproducible-zephyr.ri is less useful now that show_installed_files() shows
 		# checksums too. However: - it's still useful when only the .ri file is
 		# available (no build logs for the other image), - it makes sure sof_ri_info.py
@@ -1307,6 +1316,8 @@ def main():
 
 	build_rimage()
 	build_platforms()
+	if args.menuconfig:
+		return
 	if not args.no_tarball:
 		create_tarball()
 	show_installed_files()

src/audio/aria/Kconfig

@@ -2,6 +2,7 @@
 
 config COMP_ARIA
 	tristate "ARIA component"
+	default m if LIBRARY_DEFAULT_MODULAR
 	default n
 	depends on IPC_MAJOR_4
 	help

src/audio/crossover/Kconfig

@@ -4,6 +4,7 @@ config COMP_CROSSOVER
 	tristate "Crossover Filter component"
 	select COMP_BLOB
 	select MATH_IIR_DF2T
+	default m if LIBRARY_DEFAULT_MODULAR
 	default n
 	help
 	  Select for Crossover Filter component. A crossover can be used to

src/audio/dcblock/Kconfig

@@ -2,6 +2,7 @@
 
 config COMP_DCBLOCK
 	tristate "DC Blocking Filter component"
+	default m if LIBRARY_DEFAULT_MODULAR
 	default y
 	help
 	  Select for DC Blocking Filter component. This component filters out

src/audio/drc/Kconfig

@@ -9,6 +9,7 @@ config COMP_DRC
 	select NUMBERS_NORM
 	select MATH_EXP
 	select COMP_BLOB
+	default m if LIBRARY_DEFAULT_MODULAR
 	default n
 	help
 	  Select for Dynamic Range Compressor (DRC) component. A DRC can be used

src/audio/eq_iir/tune/sof_example_iir_eq.m

@@ -166,7 +166,7 @@ function sof_example_iir_eq()
 
 fs_list = [16e3 48e3];
 fc_list = [20 30 40 50 100];
-g_list = [0 20];
+g_list = [0 20 30 40];
 for i = 1:length(fs_list)
 	for j = 1:length(fc_list);
 		for k = 1:length(g_list);

src/audio/mfcc/Kconfig

@@ -14,6 +14,7 @@ config COMP_MFCC
 	select NATURAL_LOGARITHM_FIXED
 	select NUMBERS_NORM
 	select SQRT_FIXED
+	default m if LIBRARY_DEFAULT_MODULAR
 	default y
 	help
 	  This option enables build of a Mel-frequency cepstral coefficients