Skip to content

xtensa-build-all.sh: distinguish default/working platform and WIP. Fix toolchain coverage #5202

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

Merged
lgirdwood merged 4 commits into from
Jan 21, 2022
Merged

xtensa-build-all.sh: distinguish default/working platform and WIP. Fix toolchain coverage #5202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49a8660
.github: reformat platform list for qemu-boot-test
marc-hb Jan 12, 2022
efcfbd9
.github: add imx8ulp gcc build to pull request tests
marc-hb Jan 12, 2022
decaa1d
xtensa-build-all.sh: rn: remove odd ARCH=xtensa definition
marc-hb Jan 12, 2022
ecbd6ab
xtensa-build-all.sh: distinguish default/working platform and WIP
marc-hb Jan 12, 2022
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
15 changes: 10 additions & 5 deletions .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,10 @@ jobs:

strategy:
matrix:
platform: [sue jsl tgl]
platform: [imx8ulp,
sue jsl tgl,
rn,
]

steps:

Expand Down Expand Up @@ -114,11 +117,13 @@ jobs:

strategy:
matrix:
# Compiler-based grouping, see HOST= in xtensa-build-all.sh The
# only reason for grouping is to avoid the matrix swarming the
# user interface and burying other checks.
# Compiler-based groups, see HOST= compilers in
# xtensa-build-all.sh. Pay attention to commas and whitespace.
# The main reason for these groups is to avoid the matrix
# swarming the Github web interface and burying other checks.
platform: [imx8 imx8x imx8m,
byt cht, bdw hsw, apl skl kbl, cnl icl]
byt cht, bdw hsw, apl skl kbl, cnl icl,
]

steps:

Expand Down
19 changes: 12 additions & 7 deletions scripts/xtensa-build-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,15 @@
# stop on most errors
set -e

SUPPORTED_PLATFORMS=(byt cht bdw hsw apl skl kbl cnl sue icl jsl \
imx8 imx8x imx8m imx8ulp tgl tgl-h rn mt8195)
# Platforms with a toolchain available in the latest Docker image and
# built by the -a option.
DEFAULT_PLATFORMS=( byt cht bdw hsw apl skl kbl cnl sue icl jsl \
imx8 imx8x imx8m imx8ulp tgl tgl-h rn mt8195 )

# Work in progress can be added to this "staging area" without breaking
# the -a option for everyone.
SUPPORTED_PLATFORMS=( "${DEFAULT_PLATFORMS[@]}" )

BUILD_ROM=no
BUILD_DEBUG=no
BUILD_FORCE_UP=no
Expand Down Expand Up @@ -51,8 +58,8 @@ https://thesofproject.github.io/latest/developer_guides/firmware/cmake.html
usage: $0 [options] platform(s)

-r Build rom if available (gcc only)
-a Build all platforms
-u Force UP ARCH
-a Build all platforms which have a toolchain in the latest Docker image
-u Force CONFIG_MULTICORE=n
-d Enable debug build
-c Interactive menuconfig
-o arg, copies src/arch/xtensa/configs/override/<arg>.config
Expand Down Expand Up @@ -108,7 +115,7 @@ while getopts "rudj:ckvao:m:" OPTION; do
k) USE_PRIVATE_KEY=yes ;;
o) OVERRIDE_CONFIG=$OPTARG ;;
v) BUILD_VERBOSE='VERBOSE=1' ;;
a) PLATFORMS=("${SUPPORTED_PLATFORMS[@]}") ;;
a) PLATFORMS=("${DEFAULT_PLATFORMS[@]}") ;;
m) MEU_TOOL_PATH=$OPTARG ;;
*) print_usage; exit 1 ;;
esac
Expand Down Expand Up @@ -324,7 +331,6 @@ do
;;
rn)
PLATFORM="renoir"
ARCH="xtensa"
XTENSA_CORE="ACP_3_1_001_PROD"
HOST="xtensa-rn-elf"
XTENSA_TOOLS_VERSION="RF-2016.4-linux"
Expand Down Expand Up @@ -417,7 +423,6 @@ do
echo "CONFIG_BUILD_VM_ROM=y" >> override.config
fi

# override default ARCH if BUILD_FORCE_UP is set
if [ "x$BUILD_FORCE_UP" == "xyes" ]
then
echo "Force building UP(xtensa)..."
Expand Down