Skip to content

Commit 5cc27c8

Browse files
committed
wip: to be commited
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
1 parent 8e2979e commit 5cc27c8

3 files changed

Lines changed: 16 additions & 4 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,6 @@ build*/
6464
cscope.*
6565
ncscope.*
6666

67+
# VSCode project metadata
68+
.vscode/launch.json
69+
.vscode/settings.json

app/boards/qemu_xtensa_dc233c_mmu.conf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# SPDX-License-Identifier: BSD-3-Clause
22
CONFIG_IPC_MAJOR_4=y
33
CONFIG_USERSPACE=y
4-
CONFIG_ZTEST=y
4+
#CONFIG_ZTEST=y
55
CONFIG_TEST_USERSPACE=y
66
CONFIG_MM_DRV=y
77
CONFIG_ZEPHYR_NATIVE_DRIVERS=y
88
CONFIG_SOF_USERSPACE_LL=y
9-
CONFIG_SOF_BOOT_TEST_STANDALONE=y
9+
#CONFIG_SOF_BOOT_TEST_STANDALONE=y
1010

1111
# Ensure the kernel can exit QEMU on shutdown/panic
12-
CONFIG_REBOOT=y
13-
CONFIG_ZTEST_STACK_SIZE=4096
12+
#CONFIG_REBOOT=y
13+
#CONFIG_ZTEST_STACK_SIZE=4096
1414
CONFIG_COMP_UP_DOWN_MIXER=y
1515
CONFIG_COMP_MODULE_ADAPTER=y
1616
CONFIG_PASSTHROUGH_CODEC=y

scripts/sof-qemu-run.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,14 @@ echo "Using SOF environment at $SOF_WORKSPACE"
5757
# start the virtual environment
5858
source ${VENV_DIR}/bin/activate
5959

60+
# Execute the QEMU runner from within the correct build directory
61+
cd "${BUILD_DIR}" || exit 1
62+
63+
# For ace30 targets (ptl and wcl builds), use the explicitly built intel_ace qemu
64+
if [[ "${BUILD_DIR}" == *"ptl"* ]] || [[ "${BUILD_DIR}" == *"wcl"* ]]; then
65+
export QEMU_BIN_PATH="$SOF_WORKSPACE/qemu/build"
66+
echo "Using intel_ace QEMU for ace30 target at $QEMU_BIN_PATH"
67+
fi
68+
6069
# Finally run the python script which will now correctly inherit 'west' from the sourced environment.
6170
python3 "${SCRIPT_DIR}/sof-qemu-run.py" --build-dir "${BUILD_DIR}" $VALGRIND_ARG

0 commit comments

Comments
 (0)