Skip to content

Commit a4c8d4e

Browse files
lyakhkv2019i
authored andcommitted
Intel: remove XTOS support
XTOS isn't supported any more for Intel platforms, remove support for it. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent 93947f9 commit a4c8d4e

File tree

16 files changed

+7
-1158
lines changed

16 files changed

+7
-1158
lines changed

.github/workflows/installer.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ jobs:
2323
fail-fast: false
2424
matrix: # just a vector in this case
2525
make_env: [
26-
IPC_VERSION=, # default version
27-
IPC_VERSION=IPC4 UNSIGNED_list= SIGNED_list='tgl tgl-h',
26+
IPC_VERSION= UNSIGNED_list='imx8' SIGNED_list=, # default version
2827
]
2928

3029
steps:

.github/workflows/pull-request.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ jobs:
127127
# to COMMAS. Don't use a single big group so a single failure
128128
# does not block all other builds.
129129
platform: [imx8ulp,
130-
tgl,
131130
rn rmb,
132131
mt8186 mt8195,
133132
]

Kconfig.sof

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ config HOST_PTABLE
1111
bool
1212
default n
1313

14-
config XT_BOOT_LOADER
15-
bool
16-
default n
17-
1814
config XT_HAVE_RESET_VECTOR_ROM
1915
bool
2016
default n

installer/GNUmakefile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,11 @@
1414
# List of /lib/firmware/sof/ images and symbolic links currently
1515
# released by Intel.
1616

17-
# See rimage/config/*.toml
18-
SIGNED_list ?= tgl tgl-h
19-
2017
# To find aliases, try in a Linux kernel git clone:
2118
#
2219
# git grep 'sof-.*\.ri' -- sound/soc/
2320

24-
ALIAS_OTHER_KEY_list += adl adl-s rpl rpl-s
21+
# ALIAS_OTHER_KEY_list += adl adl-s rpl rpl-s
2522

2623
# Not supported in the main branch anymore, go to stable-v2.3
2724
# UNSIGNED_list += bdw byt cht
@@ -39,11 +36,7 @@ $(info UNSIGNED_list = ${UNSIGNED_list} )
3936
$(info SIGNED_list = ${SIGNED_list} )
4037
$(info ALIAS_list = ${ALIAS_list} )
4138

42-
target_of_ehl := tgl
43-
target_of_adl := tgl
44-
target_of_adl-s := tgl-h
45-
target_of_rpl := tgl
46-
target_of_rpl-s := tgl-h
39+
target_of_imx := imx8
4740

4841
ifeq (,${TOOLCHAIN})
4942
ifeq (,${XTENSA_TOOLS_ROOT})
Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,5 @@
11
.
2-
├── community
3-
│   ├── sof-adl-s.ri -> sof-tgl-h.ri
4-
│   ├── sof-adl.ri -> sof-tgl.ri
5-
│   ├── sof-rpl-s.ri -> sof-tgl-h.ri
6-
│   ├── sof-rpl.ri -> sof-tgl.ri
7-
│   ├── sof-tgl-h.ri
8-
│   └── sof-tgl.ri
9-
├── intel-signed
10-
├── sof-adl-s.ldc -> sof-tgl-h.ldc
11-
├── sof-adl-s.ri -> intel-signed/sof-adl-s.ri
12-
├── sof-adl.ldc -> sof-tgl.ldc
13-
├── sof-adl.ri -> intel-signed/sof-adl.ri
14-
├── sof-rpl-s.ldc -> sof-tgl-h.ldc
15-
├── sof-rpl-s.ri -> intel-signed/sof-rpl-s.ri
16-
├── sof-rpl.ldc -> sof-tgl.ldc
17-
├── sof-rpl.ri -> intel-signed/sof-rpl.ri
18-
├── sof-tgl-h.ldc
19-
├── sof-tgl-h.ri -> intel-signed/sof-tgl-h.ri
20-
├── sof-tgl.ldc
21-
└── sof-tgl.ri -> intel-signed/sof-tgl.ri
2+
├── sof-imx8.ldc
3+
└── sof-imx8.ri
224

23-
2 directories, 18 files
5+
0 directories, 2 files

scripts/test-repro-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ SOF2="$SOF_PARENT"/sof-bind-mount-DO-NOT-DELETE
3939
# considerably, replace "sof" with something of the same length:
4040
# SOF2="$SOF_PARENT"/sog
4141

42-
PLATFS=(tgl)
42+
PLATFS=(imx8)
4343

4444
# diffoscope is great but it has hundreds of dependencies, too long to
4545
# install for CI so we don't use it here. This is just an alias

scripts/xtensa-build-all.sh

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ set -e
88
# Platforms built and tested by default in CI using the `-a` option.
99
# They must have a toolchain available in the latest Docker image.
1010
DEFAULT_PLATFORMS=(
11-
tgl tgl-h
1211
imx8 imx8x imx8m imx8ulp
1312
rn rmb
1413
mt8186 mt8195
@@ -199,25 +198,6 @@ do
199198
PLATFORM_PRIVATE_KEY=''
200199

201200
case $platform in
202-
tgl)
203-
PLATFORM="tgplp"
204-
XTENSA_CORE="cavs2x_LX6HiFi3_2017_8"
205-
HOST="xtensa-cnl-elf"
206-
XTENSA_TOOLS_VERSION="RG-2017.8-linux"
207-
HAVE_ROM='yes'
208-
IPC4_CONFIG_OVERLAY="tigerlake_ipc4"
209-
# default key for TGL
210-
PLATFORM_PRIVATE_KEY="-D${SIGNING_TOOL}_PRIVATE_KEY=$SOF_TOP/keys/otc_private_key_3k.pem"
211-
;;
212-
tgl-h)
213-
PLATFORM="tgph"
214-
XTENSA_CORE="cavs2x_LX6HiFi3_2017_8"
215-
HOST="xtensa-cnl-elf"
216-
XTENSA_TOOLS_VERSION="RG-2017.8-linux"
217-
HAVE_ROM='yes'
218-
# default key for TGL
219-
PLATFORM_PRIVATE_KEY="-D${SIGNING_TOOL}_PRIVATE_KEY=$SOF_TOP/keys/otc_private_key_3k.pem"
220-
;;
221201
imx8)
222202
PLATFORM="imx8"
223203
XTENSA_CORE="hifi4_nxp_v3_3_1_2_2017"

src/arch/xtensa/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ elseif(CONFIG_MT8195)
2020
set(platform_folder mt8195)
2121
endif()
2222

23-
if(CONFIG_CAVS)
24-
set(family_path intel/cavs)
25-
endif()
26-
2723
set(fw_name ${CONFIG_RIMAGE_SIGNING_SCHEMA})
2824

2925
if(CONFIG_XT_BOOT_LOADER)

src/arch/xtensa/xtos/crt1-boards-rom.S

Lines changed: 0 additions & 166 deletions
This file was deleted.

src/platform/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ choice
99

1010
config TIGERLAKE
1111
bool "Build for Tigerlake"
12-
select XT_BOOT_LOADER
1312
select XT_IRQ_MAP
1413
select DMA_GW
1514
select DW

0 commit comments

Comments
 (0)