Skip to content

Commit 1916a28

Browse files
committed
app: boards: intel_adsp: make logging options common
Move common Zephyr logging configuration options to the shared file for Intel DSPs. Not all options can be moved as we cannot assign defaults to settings that already have a default (e.g. CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP). Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
1 parent e5bad21 commit 1916a28

7 files changed

Lines changed: 21 additions & 43 deletions

app/boards/intel_adsp/Kconfig.defconfig

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,24 @@ config PCM_CONVERTER_FORMAT_U8
6868

6969
config PIPELINE_2_0
7070
default y
71+
72+
# Zephyr / logging
73+
# ----------------------------------------
74+
75+
config LOG_BACKEND_ADSP_MTRACE
76+
default y
77+
78+
config LOG_FUNC_NAME_PREFIX_ERR
79+
default y
80+
81+
config LOG_FUNC_NAME_PREFIX_WRN
82+
default y
83+
84+
config LOG_FUNC_NAME_PREFIX_INF
85+
default y
86+
87+
config LOG_FUNC_NAME_PREFIX_DBG
88+
default y
89+
90+
config LOG_TIMESTAMP_64BIT
91+
default y

app/boards/intel_adsp_ace15_mtpm.conf

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,8 @@ CONFIG_POWER_DOMAIN=y
101101
CONFIG_POWER_DOMAIN_INTEL_ADSP=y
102102

103103
# Zephyr / logging
104-
105104
CONFIG_LOG_BACKEND_ADSP=n
106-
CONFIG_LOG_BACKEND_ADSP_MTRACE=y
107105
CONFIG_LOG_BACKEND_SOF_PROBE=n
108-
CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y
109-
CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y
110-
CONFIG_LOG_FUNC_NAME_PREFIX_INF=y
111-
CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y
112106
CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y
113-
CONFIG_LOG_TIMESTAMP_64BIT=y
114107
CONFIG_WINSTREAM_CONSOLE=n
115108
CONFIG_LOG_FLUSH_SLEEP_US=5000

app/boards/intel_adsp_ace20_lnl.conf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,6 @@ CONFIG_POWER_DOMAIN_INTEL_ADSP=y
8181

8282
# Zephyr / logging
8383
CONFIG_LOG_BACKEND_ADSP=n
84-
CONFIG_LOG_BACKEND_ADSP_MTRACE=y
85-
CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y
86-
CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y
87-
CONFIG_LOG_FUNC_NAME_PREFIX_INF=y
88-
CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y
8984
CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y
90-
CONFIG_LOG_TIMESTAMP_64BIT=y
9185
CONFIG_WINSTREAM_CONSOLE=n
9286
CONFIG_LOG_FLUSH_SLEEP_US=5000

app/boards/intel_adsp_ace30_ptl.conf

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,7 @@ CONFIG_POWER_DOMAIN=y
7878
CONFIG_POWER_DOMAIN_INTEL_ADSP=y
7979

8080
# Zephyr / logging
81-
CONFIG_LOG=y
8281
CONFIG_LOG_BACKEND_ADSP=n
83-
CONFIG_LOG_BACKEND_ADSP_MTRACE=y
8482
CONFIG_LOG_FLUSH_SLEEP_US=5000
85-
CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y
86-
CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y
87-
CONFIG_LOG_FUNC_NAME_PREFIX_INF=y
88-
CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y
89-
CONFIG_LOG_MODE_DEFERRED=y
9083
CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y
91-
CONFIG_LOG_TIMESTAMP_64BIT=y
9284
CONFIG_WINSTREAM_CONSOLE=n

app/boards/intel_adsp_ace30_wcl.conf

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,7 @@ CONFIG_POWER_DOMAIN=y
7070
CONFIG_POWER_DOMAIN_INTEL_ADSP=y
7171

7272
# Zephyr / logging
73-
CONFIG_LOG=y
7473
CONFIG_LOG_BACKEND_ADSP=n
75-
CONFIG_LOG_BACKEND_ADSP_MTRACE=y
7674
CONFIG_LOG_FLUSH_SLEEP_US=5000
77-
CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y
78-
CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y
79-
CONFIG_LOG_FUNC_NAME_PREFIX_INF=y
80-
CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y
81-
CONFIG_LOG_MODE_DEFERRED=y
8275
CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y
83-
CONFIG_LOG_TIMESTAMP_64BIT=y
8476
CONFIG_WINSTREAM_CONSOLE=n

app/boards/intel_adsp_ace40_nvl.conf

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,5 @@ CONFIG_POWER_DOMAIN_INTEL_ADSP=y
6767
CONFIG_SRAM_RETENTION_MODE=n
6868

6969
# Zephyr / logging
70-
CONFIG_LOG=y
7170
CONFIG_LOG_BACKEND_ADSP=n
72-
CONFIG_LOG_BACKEND_ADSP_MTRACE=y
73-
CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y
74-
CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y
75-
CONFIG_LOG_FUNC_NAME_PREFIX_INF=y
76-
CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y
77-
CONFIG_LOG_MODE_DEFERRED=y
7871
CONFIG_WINSTREAM_CONSOLE=n

app/boards/intel_adsp_ace40_nvls.conf

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,5 @@ CONFIG_POWER_DOMAIN_INTEL_ADSP=y
6868
CONFIG_SRAM_RETENTION_MODE=n
6969

7070
# Zephyr / logging
71-
CONFIG_LOG=y
7271
CONFIG_LOG_BACKEND_ADSP=n
73-
CONFIG_LOG_BACKEND_ADSP_MTRACE=y
74-
CONFIG_LOG_FUNC_NAME_PREFIX_ERR=y
75-
CONFIG_LOG_FUNC_NAME_PREFIX_WRN=y
76-
CONFIG_LOG_FUNC_NAME_PREFIX_INF=y
77-
CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y
78-
CONFIG_LOG_MODE_DEFERRED=y
7972
CONFIG_WINSTREAM_CONSOLE=n

0 commit comments

Comments
 (0)