Skip to content

Intel: remove XTOS support #7527

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
kv2019i merged 1 commit into from
May 11, 2023
Merged

Intel: remove XTOS support #7527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions .github/workflows/installer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ jobs:
fail-fast: false
matrix: # just a vector in this case
make_env: [
IPC_VERSION=, # default version
IPC_VERSION=IPC4 UNSIGNED_list= SIGNED_list='tgl tgl-h',
IPC_VERSION= UNSIGNED_list='imx8' SIGNED_list=, # default version
Copy link
Collaborator

@marc-hb marc-hb Apr 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dbaluta, @andyross , is anyone outside Intel looking at IPC4? With or without Zephyr?

Copy link
Contributor

@cujomalainey cujomalainey Apr 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bhiregou @bhiregoudar @yaochunhung

Copy link
Collaborator

@paulstelian97 paulstelian97 May 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right now i.MX8 IPC4 support is a discussion topic. I am not committing to doing it soon, BUT it is in my backlog, I am just lacking some information related to the firmware side of this conversion (for the kernel I have some patches ready, minus exact filenames)

I do expect Zephyr support to be done before the IPC4 migration.

Copy link
Collaborator

@marc-hb marc-hb May 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do expect Zephyr support to be done before the IPC4 migration.

Thanks, this is the information relevant to this line. It means this Github Action will never need to build IPC4+XTOS ever again so this line can be removed as @lyakh currently does.

]

steps:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ jobs:
# to COMMAS. Don't use a single big group so a single failure
# does not block all other builds.
platform: [imx8ulp,
tgl,
rn rmb,
mt8186 mt8195,
]
Expand Down
4 changes: 0 additions & 4 deletions Kconfig.sof
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ config HOST_PTABLE
bool
default n

config XT_BOOT_LOADER
bool
default n

config XT_HAVE_RESET_VECTOR_ROM
bool
default n
Expand Down
11 changes: 2 additions & 9 deletions installer/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,11 @@
# List of /lib/firmware/sof/ images and symbolic links currently
# released by Intel.

# See rimage/config/*.toml
SIGNED_list ?= tgl tgl-h

# To find aliases, try in a Linux kernel git clone:
#
# git grep 'sof-.*\.ri' -- sound/soc/

ALIAS_OTHER_KEY_list += adl adl-s rpl rpl-s
# ALIAS_OTHER_KEY_list += adl adl-s rpl rpl-s

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

target_of_ehl := tgl
target_of_adl := tgl
target_of_adl-s := tgl-h
target_of_rpl := tgl
target_of_rpl-s := tgl-h
target_of_imx := imx8
Copy link
Collaborator

@marc-hb marc-hb Apr 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you try adding one AMD product?

Copy link
Member

@lgirdwood lgirdwood Apr 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the github flows need to be updated here as well, or otherwise there will be many CI failures

@kv2019i yes, apparently PR CI is still attempting TGL XTOS builds, @lgirdwood @marc-hb do we need them? If yes, then obviously this PR cannot be merged

yep - lets make sure we update all flows. CI should not be doing any xtos builds for Intel platforms as Intel only uses Zephyr now..

Copy link
Collaborator Author

@lyakh lyakh May 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you try adding one AMD product?

@marc-hb can we make it a follow-up? I'd be happy to get this right with a minimum changes


ifeq (,${TOOLCHAIN})
ifeq (,${XTENSA_TOOLS_ROOT})
Expand Down
24 changes: 3 additions & 21 deletions installer/tests/staging_sof_ref.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,5 @@
.
├── community
│   ├── sof-adl-s.ri -> sof-tgl-h.ri
│   ├── sof-adl.ri -> sof-tgl.ri
│   ├── sof-rpl-s.ri -> sof-tgl-h.ri
│   ├── sof-rpl.ri -> sof-tgl.ri
│   ├── sof-tgl-h.ri
│   └── sof-tgl.ri
├── intel-signed
├── sof-adl-s.ldc -> sof-tgl-h.ldc
├── sof-adl-s.ri -> intel-signed/sof-adl-s.ri
├── sof-adl.ldc -> sof-tgl.ldc
├── sof-adl.ri -> intel-signed/sof-adl.ri
├── sof-rpl-s.ldc -> sof-tgl-h.ldc
├── sof-rpl-s.ri -> intel-signed/sof-rpl-s.ri
├── sof-rpl.ldc -> sof-tgl.ldc
├── sof-rpl.ri -> intel-signed/sof-rpl.ri
├── sof-tgl-h.ldc
├── sof-tgl-h.ri -> intel-signed/sof-tgl-h.ri
├── sof-tgl.ldc
└── sof-tgl.ri -> intel-signed/sof-tgl.ri
├── sof-imx8.ldc
└── sof-imx8.ri

2 directories, 18 files
0 directories, 2 files
2 changes: 1 addition & 1 deletion scripts/test-repro-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=(tgl)
PLATFS=(imx8)

# 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
Expand Down
20 changes: 0 additions & 20 deletions scripts/xtensa-build-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ 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=(
tgl tgl-h
imx8 imx8x imx8m imx8ulp
rn rmb
mt8186 mt8195
Expand Down Expand Up @@ -199,25 +198,6 @@ do
PLATFORM_PRIVATE_KEY=''

case $platform in
tgl)
PLATFORM="tgplp"
XTENSA_CORE="cavs2x_LX6HiFi3_2017_8"
HOST="xtensa-cnl-elf"
XTENSA_TOOLS_VERSION="RG-2017.8-linux"
HAVE_ROM='yes'
IPC4_CONFIG_OVERLAY="tigerlake_ipc4"
# default key for TGL
PLATFORM_PRIVATE_KEY="-D${SIGNING_TOOL}_PRIVATE_KEY=$SOF_TOP/keys/otc_private_key_3k.pem"
;;
tgl-h)
PLATFORM="tgph"
XTENSA_CORE="cavs2x_LX6HiFi3_2017_8"
HOST="xtensa-cnl-elf"
XTENSA_TOOLS_VERSION="RG-2017.8-linux"
HAVE_ROM='yes'
# default key for TGL
PLATFORM_PRIVATE_KEY="-D${SIGNING_TOOL}_PRIVATE_KEY=$SOF_TOP/keys/otc_private_key_3k.pem"
;;
imx8)
PLATFORM="imx8"
XTENSA_CORE="hifi4_nxp_v3_3_1_2_2017"
Expand Down
4 changes: 0 additions & 4 deletions src/arch/xtensa/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ elseif(CONFIG_MT8195)
set(platform_folder mt8195)
endif()

if(CONFIG_CAVS)
set(family_path intel/cavs)
endif()

set(fw_name ${CONFIG_RIMAGE_SIGNING_SCHEMA})

if(CONFIG_XT_BOOT_LOADER)
Expand Down
166 changes: 0 additions & 166 deletions src/arch/xtensa/xtos/crt1-boards-rom.S
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/platform/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ choice

config TIGERLAKE
bool "Build for Tigerlake"
select XT_BOOT_LOADER
select XT_IRQ_MAP
select DMA_GW
select DW
Expand Down
17 changes: 0 additions & 17 deletions src/platform/intel/cavs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,6 @@ target_link_libraries(sof_static_libraries INTERFACE lps_vector)
add_local_sources(sof lps_wait.c)
endif()

if(CONFIG_NO_SECONDARY_CORE_ROM)
add_library(altreset STATIC "")
target_link_libraries(altreset sof_options)
target_compile_options(altreset PRIVATE -mtext-section-literals)

add_local_sources(altreset alternate_reset_vector.S)

target_link_libraries(sof_static_libraries INTERFACE altreset)
endif()

add_local_sources(sof platform.c)

target_include_directories(sof_options INTERFACE ${PROJECT_SOURCE_DIR}/src/platform/intel/cavs/include)

add_library(cavs_ext_manifest STATIC "")
add_local_sources(cavs_ext_manifest ext_manifest.c)
sof_append_relative_path_definitions(cavs_ext_manifest)

target_link_libraries(cavs_ext_manifest sof_options)
target_link_libraries(sof_static_libraries INTERFACE cavs_ext_manifest)
Loading