Skip to content

xtensa-build-zephyr: support using IPC4 config#5280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
XiaoyunWu6666 wants to merge 1 commit into from
Closed

xtensa-build-zephyr: support using IPC4 config #5280

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions scripts/xtensa-build-zephyr.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -303,7 +303,7 @@ parse_args()
local OPTIND=1

# Parse -options
while getopts "acz:j:k:p:v" OPTION; do
while getopts "acz:j:k:p:vf" OPTION; do
case "$OPTION" in
a) PLATFORMS=("${DEFAULT_PLATFORMS[@]}") ;;
c) DO_CLONE=yes ;;
Expand All@@ -312,6 +312,7 @@ parse_args()
k) RIMAGE_KEY_OPT="$OPTARG" ;;
p) zeproj="$OPTARG" ;;
v) BUILD_VERBOSE=true ;;
f) IPC4_BUILD=true ;;
*) print_usage; exit 1 ;;
esac
done
Expand DownExpand Up@@ -430,7 +431,9 @@ see https://docs.zephyrproject.org/latest/getting_started/index.html"
mkdir -p "${WEST_TOP}"/modules/audio
ln -s "$SOF_TOP" "${WEST_TOP}"/modules/audio/sof
}

if [[ $IPC4_BUILD == true ]]; then
echo "CONFIG_IPC_MAJOR_4=y" >> ${SOF_TOP}/zephyrproject/zephyr/samples/subsys/audio/sof/boards/intel_adsp_cavs25.conf

@lgirdwoodlgirdwoodJan 28, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This only builds for one target, can we make it target generic. @marc-hb any suggestions how how this would be done here ?

@XiaoyunWu6666XiaoyunWu6666Jan 29, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marc-hb Except for adding CONFIG_IPC_MAJOR_4=y here,
according to @RanderWang,CONFIG_RIMAGE_SIGNING_SCHEMA need to be modified from "tgl-h" to "tgl-cavs" too

CONFIG_RIMAGE_SIGNING_SCHEMA="tgl-cavs"

@XiaoyunWu6666XiaoyunWu6666Jan 29, 2022

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But still encountered DSP topology loading failure with this fw and innersource topic sof cavs dev kernel.
Will post an issue later

@marc-hbmarc-hbFeb 3, 2022•
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I missed this.

We can't do it like this because this pollutes the git diff and it will also keep growing the .conf file in people's workspaces.

Zephyr has a number of Kconfig options:
https://docs.zephyrproject.org/2.7.0/guides/build/kconfig/setting.html#the-initial-configuration

For more inspiration there's also https://github.com/thesofproject/kconfig

cc:

@aiChaoSONGaiChaoSONGFeb 14, 2022•
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The document doesn't mention application level kconfig overriding, but according to

5. Otherwise, if board revisions are used and boards/<BOARD>_<revision>.conf exists in the application directory, the result of merging it with prj.conf and boards/<BOARD>.conf is used.

we can workaround it by caching a <BOARD>_<revision>.conf , and copy it to zephyr tree when build SOF+Zephyr+IPC4. @XiaoyunWu6666 can you try this?

fi
test "${#PLATFORMS[@]}" -eq 0 || build_platforms
}

Expand Down