Skip to content

Commit 27494d1

Browse files
committed
check-sof-logger.sh: remove the ldc dependency for IPC4 Zephyr platforms
1 parent b744a5a commit 27494d1

1 file changed

Lines changed: 6 additions & 20 deletions

File tree

test-case/check-sof-logger.sh

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ run_loggers()
7676
# the same time, so $data_file will hopefully not be long.
7777
local collect_secs=2
7878

79-
if is_zephyr; then
79+
if is_ipc4; then
8080
# Collect logs from Zephyr logging backends
8181

82-
if is_ipc4 ; then
82+
if is_firmware_file_zephyr; then
8383
# Get logs via SOF kernel IPC4 SRAM logging interfaces (mtrace)
8484

8585
if [ -z "$MTRACE" ]; then
@@ -95,23 +95,10 @@ run_loggers()
9595
sudo timeout -k 3 "$collect_secs" \
9696
"$mtracetool" > "$etrace_file" 2> "$etrace_stderr_file" & mtracetoolPID=$!
9797
else
98-
# SOF kernel IPC3 SRAM logging interface (etrace)
99-
100-
local cavstool
101-
cavstool=$(type -p cavstool.py)
102-
103-
dlogi "Trying to get Zephyr logs from etrace with background $cavstool ..."
104-
dlogc \
105-
"sudo $cavstool --log-only > $etrace_file 2>&1"
106-
# Firmware messages are on stdout and local messages on
107-
# stderr. Merge them and then grep ERROR below.
108-
# shellcheck disable=SC2024
109-
sudo timeout -k 3 "$collect_secs" \
110-
"$cavstool" --log-only > "$etrace_file" 2>&1 & cavstoolPID=$!
98+
dlogi 'IPC4 FW logging only support with SOF Zephyr build'
99+
return 0
111100
fi
112-
fi
113-
114-
if ! is_ipc4 ; then
101+
else
115102
# Sof-logger DMA logging (IPC3 only)
116103

117104
dlogi "Trying to get the DMA .ldc trace log with background sof-logger ..."
@@ -136,7 +123,7 @@ run_loggers()
136123
}
137124
fi
138125

139-
if is_zephyr; then
126+
if is_firmware_file_zephyr; then
140127
# Zephyr logging backends
141128

142129
if is_ipc4 ; then
@@ -180,7 +167,6 @@ run_loggers()
180167

181168
return $etrace_exit
182169
fi
183-
184170
# XTOS IPC4 case
185171
return 0
186172
}

0 commit comments

Comments
 (0)