From 96bd289f0131331991065078f155f137f3a1b42a Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Mon, 11 Mar 2024 20:32:52 +0200 Subject: [PATCH] app: boards: intel boards, disable winstream console Disable CONFIG_WINSTREAM_CONSOLE in all Intel configs that enable SOF mtrace for logging. Also disable CONFIG_LOG_BACKEND_ADSP that uses winstream as backend. No need to have two memory window based logging backends enabled at the same time. Signed-off-by: Kai Vehmanen --- app/boards/intel_adsp_ace15_mtpm.conf | 2 ++ app/boards/intel_adsp_ace20_lnl.conf | 2 ++ app/boards/intel_adsp_cavs25.conf | 2 ++ app/boards/intel_adsp_cavs25_tgph.conf | 2 ++ 4 files changed, 8 insertions(+) diff --git a/app/boards/intel_adsp_ace15_mtpm.conf b/app/boards/intel_adsp_ace15_mtpm.conf index b58c7780a3d0..4c75272de807 100644 --- a/app/boards/intel_adsp_ace15_mtpm.conf +++ b/app/boards/intel_adsp_ace15_mtpm.conf @@ -71,6 +71,8 @@ CONFIG_LOG_BACKEND_SOF_PROBE=n CONFIG_SOF_LOG_LEVEL_INF=y CONFIG_ZEPHYR_LOG=y CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y +CONFIG_LOG_BACKEND_ADSP=n +CONFIG_WINSTREAM_CONSOLE=n CONFIG_INTEL_ADSP_IPC=y CONFIG_WATCHDOG=y diff --git a/app/boards/intel_adsp_ace20_lnl.conf b/app/boards/intel_adsp_ace20_lnl.conf index 8642a1625a51..688afd3cd717 100644 --- a/app/boards/intel_adsp_ace20_lnl.conf +++ b/app/boards/intel_adsp_ace20_lnl.conf @@ -65,6 +65,8 @@ CONFIG_LOG_BACKEND_ADSP_MTRACE=y CONFIG_SOF_LOG_LEVEL_INF=y CONFIG_ZEPHYR_LOG=y CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y +CONFIG_LOG_BACKEND_ADSP=n +CONFIG_WINSTREAM_CONSOLE=n CONFIG_INTEL_ADSP_IPC=y diff --git a/app/boards/intel_adsp_cavs25.conf b/app/boards/intel_adsp_cavs25.conf index c3916db30ac0..7905e68c78b1 100644 --- a/app/boards/intel_adsp_cavs25.conf +++ b/app/boards/intel_adsp_cavs25.conf @@ -40,6 +40,8 @@ CONFIG_ZEPHYR_LOG=y CONFIG_LOG_BACKEND_ADSP_MTRACE=y CONFIG_LOG_BACKEND_ADSP=n CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y +CONFIG_WINSTREAM_CONSOLE=n + CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y CONFIG_LOG_FUNC_NAME_PREFIX_INF=y diff --git a/app/boards/intel_adsp_cavs25_tgph.conf b/app/boards/intel_adsp_cavs25_tgph.conf index 1069b35622c2..6d8440d28298 100644 --- a/app/boards/intel_adsp_cavs25_tgph.conf +++ b/app/boards/intel_adsp_cavs25_tgph.conf @@ -39,6 +39,8 @@ CONFIG_ZEPHYR_LOG=y CONFIG_LOG_BACKEND_ADSP_MTRACE=y CONFIG_LOG_BACKEND_ADSP=n CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y +CONFIG_WINSTREAM_CONSOLE=n + CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y CONFIG_LOG_FUNC_NAME_PREFIX_INF=y