Skip to content

Commit dc9ba28

Browse files
lyakhlgirdwood
authored andcommitted
platform: remove support for cAVS 1.8 platforms
Remove all support for cAVS 1.8 platformsm including Cannon Lake, Comet Lake, Whiskey Lake and Coffee Lake, they aren't supported any more. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent d371135 commit dc9ba28

74 files changed

Lines changed: 34 additions & 6621 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

app/boards/intel_adsp_cavs18.conf

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

installer/GNUmakefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ $(info UNSIGNED_list = ${UNSIGNED_list} )
3939
$(info SIGNED_list = ${SIGNED_list} )
4040
$(info ALIAS_list = ${ALIAS_list} )
4141

42-
target_of_cfl := cnl
43-
target_of_cml := cnl
44-
4542
target_of_ehl := tgl
4643
target_of_adl := tgl
4744
target_of_adl-s := tgl-h

scripts/docker_build/sof_builder/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ RUN cd "$HOME" && \
8888
git clone $CLONE_DEFAULTS --branch sof-gcc10x $CT_NG_REPO && \
8989
cd crosstool-ng && \
9090
./bootstrap && ./configure --prefix=`pwd` && make && make install && \
91-
for arch in cnl imx imx8m imx8ulp rn rmb mt8186 mt8195; do \
91+
for arch in imx imx8m imx8ulp rn rmb mt8186 mt8195; do \
9292
echo "$arch: ct-ng build start..." && \
9393
cp config-${arch}-gcc10.2-gdb9 .config && \
9494
# replace the build dist to save space
@@ -99,7 +99,6 @@ RUN cd "$HOME" && \
9999
done && \
100100
echo "Stage2: xtensa-overlay, crosstool-ng are done!"
101101

102-
ENV PATH="/home/sof/work/xtensa-cnl-elf/bin:${PATH}"
103102
ENV PATH="/home/sof/work/xtensa-rn-elf/bin:${PATH}"
104103
ENV PATH="/home/sof/work/xtensa-rmb-elf/bin:${PATH}"
105104
ENV PATH="/home/sof/work/xtensa-imx-elf/bin:${PATH}"
@@ -112,7 +111,7 @@ ARG NEWLIB_REPO=https://github.com/jcmvbkbc/newlib-xtensa.git
112111
RUN cd "$HOME" && \
113112
git clone $CLONE_DEFAULTS --branch xtensa $NEWLIB_REPO && \
114113
cd newlib-xtensa && \
115-
for arch in cnl imx imx8m imx8ulp rn rmb mt8186 mt8195; do \
114+
for arch in imx imx8m imx8ulp rn rmb mt8186 mt8195; do \
116115
./configure --target=xtensa-${arch}-elf \
117116
--prefix=/home/sof/work/xtensa-root && \
118117
make && make install && \

scripts/qemu-check.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright(c) 2018 Intel Corporation. All rights reserved.
44
set -e
55

6-
SUPPORTED_PLATFORMS=(icl cnl imx8 imx8x imx8m)
6+
SUPPORTED_PLATFORMS=(icl imx8 imx8x imx8m)
77

88
SOF_DIR=$(cd "$(dirname "$0")" && cd .. && pwd)
99

@@ -81,13 +81,6 @@ do
8181

8282
has_rom=false
8383
case "$platform" in
84-
cnl)
85-
READY_IPC="00 00 00 f0"
86-
SHM_IPC_REG="qemu-bridge-ipc(|-dsp)-io"
87-
OUTBOX_OFFSET="5000"
88-
SHM_MBOX=qemu-bridge-hp-sram-mem
89-
has_rom=true
90-
;;
9184
icl)
9285
READY_IPC="00 00 00 f0"
9386
SHM_IPC_REG="qemu-bridge-ipc(|-dsp)-io"

scripts/xtensa-build-all.sh

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ SUPPORTED_PLATFORMS+=( mt8188 )
2424
# Not actually "supported" in the main branch anymore (go to stable-v2.3
2525
# instead) but kept here for historical reasons and experimentation
2626
# convenience.
27-
SUPPORTED_PLATFORMS+=( cnl icl jsl )
27+
SUPPORTED_PLATFORMS+=( icl jsl )
2828

2929
BUILD_ROM=no
3030
BUILD_DEBUG=no
@@ -204,13 +204,6 @@ do
204204
PLATFORM_PRIVATE_KEY=''
205205

206206
case $platform in
207-
cnl)
208-
PLATFORM="cannonlake"
209-
XTENSA_CORE="X6H3CNL_2017_8"
210-
HOST="xtensa-cnl-elf"
211-
XTENSA_TOOLS_VERSION="RG-2017.8-linux"
212-
HAVE_ROM='yes'
213-
;;
214207
icl)
215208
PLATFORM="icelake"
216209
XTENSA_CORE="X6H3CNL_2017_8"
@@ -338,11 +331,7 @@ do
338331
TOOLCHAIN=$HOST
339332
PATH=$SOF_TOP/../$HOST/bin:$OLDPATH
340333
COMPILER="gcc"
341-
342-
case "$platform" in
343-
cnl) DEFCONFIG_PATCH="_gcc";;
344-
*) DEFCONFIG_PATCH="";;
345-
esac
334+
DEFCONFIG_PATCH=""
346335
fi
347336

348337
BUILD_DIR=build_${platform}_${COMPILER}

scripts/xtensa-build-zephyr.py

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,6 @@
7272

7373
platform_list = [
7474
# Intel platforms
75-
{
76-
"name": "cnl",
77-
"PLAT_CONFIG": "intel_adsp_cavs18",
78-
"XTENSA_CORE": "X6H3CNL_2017_8",
79-
"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}",
80-
"DEFAULT_TOOLCHAIN_VARIANT": "xcc"
81-
},
8275
{
8376
"name": "icl",
8477
"PLAT_CONFIG": "intel_adsp_cavs20",
@@ -192,23 +185,19 @@ def parse_args():
192185
For SOF:
193186
/lib/firmware/intel/sof
194187
└───────community
195-
│ ├── sof-tgl.ri
196-
│ └── sof-cnl.ri
188+
│ └── sof-tgl.ri
197189
├── dbgkey
198-
│ ├── sof-tgl.ri
199-
│ └── sof-cnl.ri
200-
├── sof-tgl.ri
201-
└── sof-cnl.ri
190+
│ └── sof-tgl.ri
191+
└── sof-tgl.ri
202192
For AVS(filename dsp_basefw.bin):
203193
Noted that with fw_naming set as 'AVS', there will be output subdirectories for each platform
204194
/lib/firmware/intel/sof-ipc4
205195
└── tgl
206-
│ ├── community
207-
│ │ └── dsp_basefw.bin
208-
│ ├── dbgkey
209-
│ │ └── dsp_basefw.bin
210-
│ └── dsp_basefw.bin
211-
└── cnl"""
196+
├── community
197+
│ └── dsp_basefw.bin
198+
├── dbgkey
199+
│ └── dsp_basefw.bin
200+
└── dsp_basefw.bin"""
212201
)
213202
parser.add_argument("-j", "--jobs", required=False, type=int,
214203
help="Number of concurrent jobs. Passed to west build and"

src/arch/xtensa/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
# platform-specific values
44

5-
if(CONFIG_CANNONLAKE)
6-
set(platform_folder cannonlake)
7-
elseif(CONFIG_ICELAKE)
5+
if(CONFIG_ICELAKE)
86
set(platform_folder icelake)
97
elseif(CONFIG_TIGERLAKE)
108
set(platform_folder tigerlake)

src/arch/xtensa/configs/cannonlake_defconfig

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

src/arch/xtensa/configs/cannonlake_gcc_defconfig

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

src/arch/xtensa/configs/override/cannonlake_chrome.config

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)