From 6b317b5df8f2b7cd35d2a899d00d1fc1cdf20bbe Mon Sep 17 00:00:00 2001 From: Laurentiu Mihalcea Date: Tue, 13 Feb 2024 13:06:59 +0200 Subject: [PATCH 1/4] workflow: remove imx8/imx8x platforms from QEMU boot test XTOS will be deprecated on imx8/imx8x and these platforms will be moved to native Zephyr so remove them from the QEMU boot test which uses SOF with XTOS. Signed-off-by: Laurentiu Mihalcea --- .github/workflows/pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index e430f387745f..aed3cd275996 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -167,7 +167,7 @@ jobs: # The main reason for these groups is to avoid the matrix # swarming the Github web interface and burying other checks. # See longer example above. - platform: [imx8 imx8x imx8m, + platform: [imx8m, ] steps: From 3e1bb629ddec7ee7d877bd6f2b3e52f3a5c8c346 Mon Sep 17 00:00:00 2001 From: Laurentiu Mihalcea Date: Tue, 13 Feb 2024 13:26:04 +0200 Subject: [PATCH 2/4] installer: replace imx8 with imx8m XTOS is going to be deprecated on imx8/imx8x so replace imx8 with imx8m. Signed-off-by: Laurentiu Mihalcea --- .github/workflows/installer.yml | 2 +- installer/tests/staging_sof_ref.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml index d85e7f071176..012b1bddd42e 100644 --- a/.github/workflows/installer.yml +++ b/.github/workflows/installer.yml @@ -23,7 +23,7 @@ jobs: fail-fast: false matrix: # just a vector in this case make_env: [ - IPC_VERSION= UNSIGNED_list='imx8' SIGNED_list=, # default version + IPC_VERSION= UNSIGNED_list='imx8m' SIGNED_list=, # default version ] steps: diff --git a/installer/tests/staging_sof_ref.txt b/installer/tests/staging_sof_ref.txt index 0029924ddd40..7a5f6a92d5e2 100644 --- a/installer/tests/staging_sof_ref.txt +++ b/installer/tests/staging_sof_ref.txt @@ -1,5 +1,5 @@ . -├── sof-imx8.ldc -└── sof-imx8.ri +├── sof-imx8m.ldc +└── sof-imx8m.ri 0 directories, 2 files From 8de929f585e10d858ae90fb258632379284ec07a Mon Sep 17 00:00:00 2001 From: Laurentiu Mihalcea Date: Tue, 13 Feb 2024 13:26:50 +0200 Subject: [PATCH 3/4] script: test-repro-build: change imx8 with AMD's rmb XTOS is going to be deprecated on all NXP's platforms so replace imx8 with AMD's rmb so that the CI test can be kept. Signed-off-by: Laurentiu Mihalcea --- scripts/test-repro-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test-repro-build.sh b/scripts/test-repro-build.sh index d06c920c628d..a6d0f7dad643 100755 --- a/scripts/test-repro-build.sh +++ b/scripts/test-repro-build.sh @@ -39,7 +39,7 @@ SOF2="$SOF_PARENT"/sof-bind-mount-DO-NOT-DELETE # considerably, replace "sof" with something of the same length: # SOF2="$SOF_PARENT"/sog -PLATFS=(imx8) +PLATFS=(rmb) # diffoscope is great but it has hundreds of dependencies, too long to # install for CI so we don't use it here. This is just an alias From 454e9e2dc35237c3b42af1af678bd874ebec3e77 Mon Sep 17 00:00:00 2001 From: Laurentiu Mihalcea Date: Mon, 12 Feb 2024 17:22:17 +0200 Subject: [PATCH 4/4] scripts: xtensa-build-all: remove imx8/imx8x To prepare for XTOS deprecation and switch to Zephyr native drivers on imx8/imx8x, remove the ability to build SOF with XTOS on them. Signed-off-by: Laurentiu Mihalcea --- scripts/xtensa-build-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/xtensa-build-all.sh b/scripts/xtensa-build-all.sh index 85c20a5fa167..72d1ee6205fb 100755 --- a/scripts/xtensa-build-all.sh +++ b/scripts/xtensa-build-all.sh @@ -8,7 +8,7 @@ set -e # Platforms built and tested by default in CI using the `-a` option. # They must have a toolchain available in the latest Docker image. DEFAULT_PLATFORMS=( - imx8 imx8x imx8m imx8ulp + imx8m imx8ulp rn rmb vangogh mt8186 mt8195 )