platform: remove support for cAVS 1.5 platforms

Remove all support for cAVS 1.5 platformsm including Apollo Lake, Sky Lake, Kaby Lake, Broxton and Gemini Lake, they aren't supported any more. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
jsarha · Mar 2, 2023 · 0f0acaa · 0f0acaa
1 parent 039ccee
commit 0f0acaa
Show file tree

Hide file tree

Showing 95 changed files with 46 additions and 8,538 deletions.
diff --git a/app/boards/intel_adsp_cavs15.conf b/app/boards/intel_adsp_cavs15.conf
diff --git a/installer/GNUmakefile b/installer/GNUmakefile
@@ -39,7 +39,6 @@ $(info UNSIGNED_list = ${UNSIGNED_list} )
 $(info SIGNED_list   = ${SIGNED_list}   )
 $(info ALIAS_list    = ${ALIAS_list}    )
 
-target_of_glk := apl
 target_of_cfl := cnl
 target_of_cml := cnl
 
@@ -312,10 +311,10 @@ COMPARE_REFS ?= /lib/firmware/intel
 checktree:
 	cd ${STAGING_SOF_VERSION} && \
              tree -a -v --dirsfirst . >  ${BUILDS_ROOT}/staging_sof_tree.txt
-	# Update sof-apl-nocodec.tplg when adding or removing a default platform
+	# Update sof-cavs-nocodec.tplg when adding or removing a default platform
 	diff -u tests/staging_sof${IPC_VERSION}_ref.txt ${BUILDS_ROOT}/staging_sof_tree.txt
 	# Check two random topologies are there
-	test -f ${STAGING_SOF_TPLG}/sof-apl-nocodec.tplg
+	test -f ${STAGING_SOF_TPLG}/sof-tgl-nocodec.tplg
 	test -f ${STAGING_SOF_TPLG}/sof-imx8-wm8960.tplg
 	for t in sof-ctl sof-logger sof-probes; do \
 	   test -f ${STAGING_TOOLS}${VERSION_SUFFIX}/$${t}; done

diff --git a/scripts/cmake/xtensa-toolchain.cmake b/scripts/cmake/xtensa-toolchain.cmake
@@ -6,7 +6,7 @@ else()
 		" Please specify toolchain to use.\n"
 		" Examples:\n"
 		" 	1) cmake -DTOOLCHAIN=xt ...\n"
-		" 	2) cmake -DTOOLCHAIN=xtensa-apl-elf ...\n"
+		" 	2) cmake -DTOOLCHAIN=xtensa-cnl-elf ...\n"
 	)
 endif()
 

diff --git a/scripts/docker_build/sof_builder/Dockerfile b/scripts/docker_build/sof_builder/Dockerfile
@@ -88,7 +88,7 @@ RUN cd "$HOME" && \
 	git clone $CLONE_DEFAULTS --branch sof-gcc10x $CT_NG_REPO && \
 	cd crosstool-ng && \
 	./bootstrap && ./configure --prefix=`pwd` && make && make install && \
-	for arch in apl cnl imx imx8m imx8ulp rn rmb mt8186 mt8195; do \
+	for arch in cnl imx imx8m imx8ulp rn rmb mt8186 mt8195; do \
 		echo "$arch: ct-ng build start..." && \
 		cp config-${arch}-gcc10.2-gdb9 .config && \
 		# replace the build dist to save space
@@ -99,7 +99,6 @@ RUN cd "$HOME" && \
 	done && \
 	echo "Stage2: xtensa-overlay, crosstool-ng are done!"
 
-ENV PATH="/home/sof/work/xtensa-apl-elf/bin:${PATH}"
 ENV PATH="/home/sof/work/xtensa-cnl-elf/bin:${PATH}"
 ENV PATH="/home/sof/work/xtensa-rn-elf/bin:${PATH}"
 ENV PATH="/home/sof/work/xtensa-rmb-elf/bin:${PATH}"
@@ -113,7 +112,7 @@ ARG NEWLIB_REPO=https://github.com/jcmvbkbc/newlib-xtensa.git
 RUN cd "$HOME" && \
 	git clone $CLONE_DEFAULTS --branch xtensa $NEWLIB_REPO && \
 	cd newlib-xtensa && \
-	for arch in apl cnl imx imx8m imx8ulp rn rmb mt8186 mt8195; do \
+	for arch in cnl imx imx8m imx8ulp rn rmb mt8186 mt8195; do \
 		./configure --target=xtensa-${arch}-elf \
 		--prefix=/home/sof/work/xtensa-root && \
 		make && make install && \

diff --git a/scripts/qemu-check.sh b/scripts/qemu-check.sh
@@ -3,7 +3,7 @@
 # Copyright(c) 2018 Intel Corporation. All rights reserved.
 set -e
 
-SUPPORTED_PLATFORMS=(apl icl skl kbl cnl imx8 imx8x imx8m)
+SUPPORTED_PLATFORMS=(icl cnl imx8 imx8x imx8m)
 
 SOF_DIR=$(cd "$(dirname "$0")" && cd .. && pwd)
 
@@ -81,32 +81,6 @@ do
 
 	has_rom=false
 	case "$platform" in
-		apl)
-		# This READY_IPC value comes from:
-		#   ipc_write(IPC_DIPCIDR, IPC_DIPCIDR_BUSY | header);
-		#   header = FE_READY = 0x7
-		#   IPC_DIPCIDR_BUSY = BIT(31)
-		# So "00 00 00 f0" is just "F0000000"
-			READY_IPC="00 00 00 f0"
-			SHM_IPC_REG="qemu-bridge-ipc(|-dsp)-io"
-			OUTBOX_OFFSET="7000"
-			SHM_MBOX=qemu-bridge-hp-sram-mem
-			has_rom=true
-			;;
-		skl)
-			READY_IPC="00 00 00 f0"
-			SHM_IPC_REG="qemu-bridge-ipc(|-dsp)-io"
-			OUTBOX_OFFSET="7000"
-			SHM_MBOX=qemu-bridge-hp-sram-mem
-			has_rom=true
-			;;
-		kbl)
-			READY_IPC="00 00 00 f0"
-			SHM_IPC_REG="qemu-bridge-ipc(|-dsp)-io"
-			OUTBOX_OFFSET="7000"
-			SHM_MBOX=qemu-bridge-hp-sram-mem
-			has_rom=true
-			;;
 		cnl)
 			READY_IPC="00 00 00 f0"
 			SHM_IPC_REG="qemu-bridge-ipc(|-dsp)-io"

diff --git a/scripts/scan/clang-scan-build-xtensa.sh b/scripts/scan/clang-scan-build-xtensa.sh
@@ -15,7 +15,7 @@ function usage {
 	echo "        [-j n]    Set number of make build jobs."
 	echo "        [-v]      Verbose output."
 	echo "Examples:"
-	echo "        $0 -t xt -c apollolake \\"
+	echo "        $0 -t xt -c tigerlake \\"
 	echo "                -r \$CONFIG_PATH/xtensa-elf"
 	echo "        $0 -t xtensa-cnl-elf -c cannonlake \\"
 	echo "                -r \`pwd\`/../xtensa-cnl-elf"

diff --git a/scripts/xtensa-build-all.sh b/scripts/xtensa-build-all.sh
@@ -24,7 +24,7 @@ SUPPORTED_PLATFORMS+=( mt8188 )
 # Not actually "supported" in the main branch anymore (go to stable-v2.3
 # instead) but kept here for historical reasons and experimentation
 # convenience.
-SUPPORTED_PLATFORMS+=( apl skl kbl cnl icl jsl )
+SUPPORTED_PLATFORMS+=( cnl icl jsl )
 
 BUILD_ROM=no
 BUILD_DEBUG=no
@@ -204,48 +204,6 @@ do
 	PLATFORM_PRIVATE_KEY=''
 
 	case $platform in
-		apl)
-			PLATFORM="apollolake"
-			XTENSA_CORE="X4H3I16w2D48w3a_2017_8"
-
-			# test APL compiler aliases
-			if command -v xtensa-bxt-elf-gcc; then
-				HOST="xtensa-bxt-elf"
-			else
-				HOST="xtensa-apl-elf"
-			fi
-
-			XTENSA_TOOLS_VERSION="RG-2017.8-linux"
-			HAVE_ROM='yes'
-			;;
-		skl)
-			PLATFORM="skylake"
-			XTENSA_CORE="X4H3I16w2D48w3a_2017_8"
-
-			# test APL compiler aliases
-			if command -v xtensa-bxt-elf-gcc; then
-				HOST="xtensa-bxt-elf"
-			else
-				HOST="xtensa-apl-elf"
-			fi
-
-			XTENSA_TOOLS_VERSION="RG-2017.8-linux"
-			HAVE_ROM='yes'
-			;;
-		kbl)
-			PLATFORM="kabylake"
-			XTENSA_CORE="X4H3I16w2D48w3a_2017_8"
-
-			# test APL compiler aliases
-			if command -v xtensa-bxt-elf-gcc; then
-				HOST="xtensa-bxt-elf"
-			else
-				HOST="xtensa-apl-elf"
-			fi
-
-			XTENSA_TOOLS_VERSION="RG-2017.8-linux"
-			HAVE_ROM='yes'
-			;;
 		cnl)
 			PLATFORM="cannonlake"
 			XTENSA_CORE="X6H3CNL_2017_8"

diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py
@@ -72,13 +72,6 @@
 
 platform_list = [
 	# Intel platforms
-	{
-		"name": "apl",
-		"PLAT_CONFIG": "intel_adsp_cavs15",
-		"XTENSA_CORE": "X4H3I16w2D48w3a_2017_8",
-		"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}",
-		"DEFAULT_TOOLCHAIN_VARIANT": "xcc"
-	},
 	{
 		"name": "cnl",
 		"PLAT_CONFIG": "intel_adsp_cavs18",

diff --git a/src/arch/xtensa/CMakeLists.txt b/src/arch/xtensa/CMakeLists.txt
@@ -2,9 +2,7 @@
 
 # platform-specific values
 
-if(CONFIG_APOLLOLAKE)
-	set(platform_folder apollolake)
-elseif(CONFIG_CANNONLAKE)
+if(CONFIG_CANNONLAKE)
 	set(platform_folder cannonlake)
 elseif(CONFIG_ICELAKE)
 	set(platform_folder icelake)
@@ -546,10 +544,6 @@ list(APPEND UNSIGNED_RI rn rmb)
 # MediaTek
 list(APPEND UNSIGNED_RI mt8186 mt8188 mt8195)
 
-# Signed and non-deterministic but sof_ri_info.py is not compatible with
-# manifest v1.5?  "CSE manifest magic number not found"
-set(UNSUPPORTED_RI skl kbl)
-
 if(${fw_name} IN_LIST UNSIGNED_RI) # mere copy
 	add_custom_command(OUTPUT reproducible.ri
 		COMMENT "Copying sof.ri to reproducible.ri as is"
@@ -559,13 +553,6 @@ if(${fw_name} IN_LIST UNSIGNED_RI) # mere copy
 		COMMAND cmake -E copy sof-${fw_name}.ri reproducible.ri
 		VERBATIM
 		)
-elseif(${fw_name} IN_LIST UNSUPPORTED_RI)
-	add_custom_command(OUTPUT reproducible.ri
-		COMMENT "WARNING: sof-${fw_name}.ri is NOT reproducible, reproducible.ri is fake"
-		DEPENDS glue_binary_files sof-${fw_name}.ri
-		COMMAND cmake -E touch reproducible.ri
-		VERBATIM
-		)
 else() # strip variables
 	add_custom_command(OUTPUT reproducible.ri
 		COMMENT "Creating reproducible.ri"

diff --git a/src/arch/xtensa/configs/apollolake_defconfig b/src/arch/xtensa/configs/apollolake_defconfig
diff --git a/src/arch/xtensa/configs/kabylake_defconfig b/src/arch/xtensa/configs/kabylake_defconfig
diff --git a/src/arch/xtensa/configs/skylake_defconfig b/src/arch/xtensa/configs/skylake_defconfig
diff --git a/src/arch/xtensa/xtos/reset-vector.S b/src/arch/xtensa/xtos/reset-vector.S
@@ -339,17 +339,7 @@ _ResetHandler:
 
 #if XCHAL_HAVE_PREFETCH
 	/* Enable cache prefetch if present.  */
-#if CONFIG_APOLLOLAKE
-
-#if CONFIG_SKYLAKE || CONFIG_KABYLAKE
-	movi.n	a2, 0	/* skylake and kabylake */
-#else
-	movi.n	a2, 34  /* apollolake */
-#endif
-
-#else
-	movi.n	a2, 68  /* eveything else */
-#endif
+	movi.n	a2, 68
 	wsr	a2, PREFCTL
 #endif
 

diff --git a/src/audio/Kconfig b/src/audio/Kconfig
@@ -255,7 +255,7 @@ config COMP_DCBLOCK
 	  the DC offset which often originates from a microphone's output.
 
 config MAXIM_DSM
-	depends on CAVS && !CAVS_VERSION_1_5
+	depends on CAVS
 	bool "Maxim DSM component"
 	select COMP_BLOB
 	default n