diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index 6be6efc2f8b..f843250ba8a 100644 --- a/MAINTAINERS.yml +++ b/MAINTAINERS.yml @@ -2573,7 +2573,6 @@ West: - marc-hb files: - modules/Kconfig.sof - - samples/modules/sof/ labels: - manifest-sof diff --git a/samples/modules/sof/CMakeLists.txt b/samples/modules/sof/CMakeLists.txt deleted file mode 100644 index ed6e53025fe..00000000000 --- a/samples/modules/sof/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -cmake_minimum_required(VERSION 3.20.0) - -find_package(Zephyr HINTS $ENV{ZEPHYR_BASE}) -project(sample_sof) - -target_sources(app PRIVATE - src/main.c - ) - -zephyr_library_include_directories(app PUBLIC - ${sof_module}/src/arch/xtensa/include - ${sof_module}/src/include - ) diff --git a/samples/modules/sof/boards/intel_adsp_ace15_mtpm.conf b/samples/modules/sof/boards/intel_adsp_ace15_mtpm.conf deleted file mode 100644 index f510e7d6fc8..00000000000 --- a/samples/modules/sof/boards/intel_adsp_ace15_mtpm.conf +++ /dev/null @@ -1,13 +0,0 @@ -CONFIG_INTEL_DMIC=y -CONFIG_INTEL_SSP=y -CONFIG_INTEL_ALH=y -CONFIG_LP_MEMORY_BANKS=1 -CONFIG_RIMAGE_SIGNING_SCHEMA="mtl" -CONFIG_IPC_MAJOR_4=y -CONFIG_COMP_SRC=n -CONFIG_INTEL_ADSP_TIMER=n -CONFIG_FORMAT_CONVERT_HIFI3=n - -CONFIG_PM=y -CONFIG_PM_DEVICE=y -CONFIG_PM_DEVICE_RUNTIME=y diff --git a/samples/modules/sof/boards/intel_adsp_cavs15.conf b/samples/modules/sof/boards/intel_adsp_cavs15.conf deleted file mode 100644 index 0e0b12547d8..00000000000 --- a/samples/modules/sof/boards/intel_adsp_cavs15.conf +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_APOLLOLAKE=y -CONFIG_INTEL_DMIC=y -CONFIG_INTEL_SSP=y -CONFIG_LP_MEMORY_BANKS=2 -CONFIG_HP_MEMORY_BANKS=8 -CONFIG_PERFORMANCE_COUNTERS=y -CONFIG_COMP_SRC_TINY=y diff --git a/samples/modules/sof/boards/intel_adsp_cavs18.conf b/samples/modules/sof/boards/intel_adsp_cavs18.conf deleted file mode 100644 index a49f550c35c..00000000000 --- a/samples/modules/sof/boards/intel_adsp_cavs18.conf +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_CANNONLAKE=y -CONFIG_INTEL_DMIC=y -CONFIG_INTEL_SSP=y -CONFIG_INTEL_ALH=y -CONFIG_LP_MEMORY_BANKS=1 -CONFIG_HP_MEMORY_BANKS=47 -CONFIG_PERFORMANCE_COUNTERS=y diff --git a/samples/modules/sof/boards/intel_adsp_cavs20.conf b/samples/modules/sof/boards/intel_adsp_cavs20.conf deleted file mode 100644 index 0f3a659cbe2..00000000000 --- a/samples/modules/sof/boards/intel_adsp_cavs20.conf +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_ICELAKE=y -CONFIG_INTEL_DMIC=y -CONFIG_INTEL_SSP=y -CONFIG_INTEL_ALH=y -CONFIG_LP_MEMORY_BANKS=1 -CONFIG_HP_MEMORY_BANKS=47 diff --git a/samples/modules/sof/boards/intel_adsp_cavs20_jsl.conf b/samples/modules/sof/boards/intel_adsp_cavs20_jsl.conf deleted file mode 100644 index 46579f49dd0..00000000000 --- a/samples/modules/sof/boards/intel_adsp_cavs20_jsl.conf +++ /dev/null @@ -1,5 +0,0 @@ -CONFIG_ICELAKE=y -CONFIG_INTEL_DMIC=y -CONFIG_INTEL_SSP=y -CONFIG_LP_MEMORY_BANKS=1 -CONFIG_HP_MEMORY_BANKS=16 diff --git a/samples/modules/sof/boards/intel_adsp_cavs25.conf b/samples/modules/sof/boards/intel_adsp_cavs25.conf deleted file mode 100644 index a9cfea64bba..00000000000 --- a/samples/modules/sof/boards/intel_adsp_cavs25.conf +++ /dev/null @@ -1,10 +0,0 @@ -CONFIG_TIGERLAKE=y -CONFIG_INTEL_DMIC=y -CONFIG_INTEL_SSP=y -CONFIG_INTEL_ALH=y -CONFIG_LP_MEMORY_BANKS=1 -CONFIG_HP_MEMORY_BANKS=30 -CONFIG_RIMAGE_SIGNING_SCHEMA="tgl" -CONFIG_PM=y -CONFIG_PM_DEVICE=y -CONFIG_PM_DEVICE_RUNTIME=y diff --git a/samples/modules/sof/boards/intel_adsp_cavs25_tgph.conf b/samples/modules/sof/boards/intel_adsp_cavs25_tgph.conf deleted file mode 100644 index 7ec23d23729..00000000000 --- a/samples/modules/sof/boards/intel_adsp_cavs25_tgph.conf +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_TIGERLAKE=y -CONFIG_INTEL_DMIC=y -CONFIG_INTEL_SSP=y -CONFIG_INTEL_ALH=y -CONFIG_LP_MEMORY_BANKS=1 -CONFIG_HP_MEMORY_BANKS=30 -CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-h" diff --git a/samples/modules/sof/boards/nxp_adsp_imx8.conf b/samples/modules/sof/boards/nxp_adsp_imx8.conf deleted file mode 100644 index a245738a5d8..00000000000 --- a/samples/modules/sof/boards/nxp_adsp_imx8.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_IMX8=y -CONFIG_HAVE_AGENT=n -CONFIG_FORMAT_CONVERT_HIFI3=n -CONFIG_KPB_FORCE_COPY_TYPE_NORMAL=n diff --git a/samples/modules/sof/boards/nxp_adsp_imx8m.conf b/samples/modules/sof/boards/nxp_adsp_imx8m.conf deleted file mode 100644 index bb9d8602449..00000000000 --- a/samples/modules/sof/boards/nxp_adsp_imx8m.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_IMX8M=y -CONFIG_HAVE_AGENT=n -CONFIG_FORMAT_CONVERT_HIFI3=n -CONFIG_KPB_FORCE_COPY_TYPE_NORMAL=n diff --git a/samples/modules/sof/boards/nxp_adsp_imx8x.conf b/samples/modules/sof/boards/nxp_adsp_imx8x.conf deleted file mode 100644 index a7766c19bb6..00000000000 --- a/samples/modules/sof/boards/nxp_adsp_imx8x.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_IMX8X=y -CONFIG_HAVE_AGENT=n -CONFIG_FORMAT_CONVERT_HIFI3=n -CONFIG_KPB_FORCE_COPY_TYPE_NORMAL=n diff --git a/samples/modules/sof/prj.conf b/samples/modules/sof/prj.conf deleted file mode 100644 index 6adb48a9e63..00000000000 --- a/samples/modules/sof/prj.conf +++ /dev/null @@ -1,29 +0,0 @@ -CONFIG_SOF=y -CONFIG_LOG=y -CONFIG_LOG_PRINTK=y -CONFIG_BUILD_OUTPUT_BIN=n -CONFIG_HAVE_AGENT=n - -# Requires heap_info() be implemented, but no Zephyr wrapper -CONFIG_DEBUG_MEMORY_USAGE_SCAN=n - -# Ensure -O2 (or similar) is used for optimization -CONFIG_SPEED_OPTIMIZATIONS=y - -# Zephyr top-level default of -fno-strict-overflow is -# not a good fit for audio DSP code -CONFIG_COMPILER_OPT="-fstrict-overflow" - -CONFIG_SCHED_DEADLINE=y -CONFIG_SCHED_CPU_MASK=y -CONFIG_SMP_BOOT_DELAY=y - -# Fix the sys ticks value until following bugs are solved: -# - https://github.com/zephyrproject-rtos/zephyr/issues/46378 -CONFIG_SYS_CLOCK_TICKS_PER_SEC=15000 -CONFIG_DAI=y -CONFIG_HEAP_MEM_POOL_SIZE=2048 - -# SoF pins threads to specific cores. This option allows -# Zephyr to do further cache optimizations -CONFIG_SCHED_CPU_MASK_PIN_ONLY=y diff --git a/samples/modules/sof/sample.yaml b/samples/modules/sof/sample.yaml deleted file mode 100644 index b3cd8488205..00000000000 --- a/samples/modules/sof/sample.yaml +++ /dev/null @@ -1,22 +0,0 @@ -sample: - description: Audio with SOF - name: sof -common: - tags: audio - modules: - - sof -tests: - sample.audio.sof: - tags: sof - build_only: true - platform_allow: intel_adsp_cavs15 intel_adsp_cavs18 intel_adsp_cavs20 - intel_adsp_cavs25 nxp_adsp_imx8 nxp_adsp_imx8x nxp_adsp_imx8m - - integration_platforms: - - intel_adsp_cavs15 - - intel_adsp_cavs18 - - intel_adsp_cavs20 - - intel_adsp_cavs25 - - nxp_adsp_imx8 - - nxp_adsp_imx8x - - nxp_adsp_imx8m diff --git a/samples/modules/sof/src/main.c b/samples/modules/sof/src/main.c deleted file mode 100644 index 304a18f0273..00000000000 --- a/samples/modules/sof/src/main.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2020 Intel Corporation. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -#include - -#include -LOG_MODULE_REGISTER(main, LOG_LEVEL_DBG); - -/** - * Should be included from sof/schedule/task.h - * but triggers include chain issue - * FIXME - */ -int sof_main(int argc, char *argv[]); - -/** - * TODO: Here comes SOF initialization - */ - -void main(void) -{ - int ret; - - LOG_INF("SOF on %s", CONFIG_BOARD); - - /* sof_main is actually SOF initialization */ - ret = sof_main(0, NULL); - if (ret) { - LOG_ERR("SOF initialization failed"); - } - - LOG_INF("SOF initialized"); -}