Skip to content

board: intel_adsp_ace15_mtpm xtensa toolchain upgrade and enable xt-clang #7027

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
lgirdwood merged 3 commits into from
Feb 28, 2023
Merged

board: intel_adsp_ace15_mtpm xtensa toolchain upgrade and enable xt-clang #7027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a8b54a
xtensa-build-zephyr.py: upgraded Xtensa toolchain for MTL
Feb 1, 2023
5057503
Set SOF C++ language standard to C++17 for Zephyr builds
Feb 23, 2023
780c2ab
west.yml: upgrade Zephyr to e3ae110a05d
Feb 23, 2023
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
22 changes: 15 additions & 7 deletions scripts/xtensa-build-zephyr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,25 +76,29 @@
"name": "apl",
"PLAT_CONFIG": "intel_adsp_cavs15",
"XTENSA_CORE": "X4H3I16w2D48w3a_2017_8",
"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}"
"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}",
"DEFAULT_TOOLCHAIN_VARIANT": "xcc"
},
{
"name": "cnl",
"PLAT_CONFIG": "intel_adsp_cavs18",
"XTENSA_CORE": "X6H3CNL_2017_8",
"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}"
"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}",
"DEFAULT_TOOLCHAIN_VARIANT": "xcc"
},
{
"name": "icl",
"PLAT_CONFIG": "intel_adsp_cavs20",
"XTENSA_CORE": "X6H3CNL_2017_8",
"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}"
"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}",
"DEFAULT_TOOLCHAIN_VARIANT": "xcc"
},
{
"name": "jsl",
"PLAT_CONFIG": "intel_adsp_cavs20_jsl",
"XTENSA_CORE": "X6H3CNL_2017_8",
"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}"
"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}",
"DEFAULT_TOOLCHAIN_VARIANT": "xcc"
},
{
"name": "tgl",
Expand All @@ -103,6 +107,7 @@
"IPC4_RIMAGE_DESC": "tgl-cavs.toml",
"XTENSA_CORE": "cavs2x_LX6HiFi3_2017_8",
"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}",
"DEFAULT_TOOLCHAIN_VARIANT": "xcc",
"RIMAGE_KEY": pathlib.Path(SOF_TOP, "keys", "otc_private_key_3k.pem")
},
{
Expand All @@ -112,13 +117,15 @@
"IPC4_RIMAGE_DESC": "tgl-h-cavs.toml",
"XTENSA_CORE": "cavs2x_LX6HiFi3_2017_8",
"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}",
"DEFAULT_TOOLCHAIN_VARIANT": "xcc",
"RIMAGE_KEY": pathlib.Path(SOF_TOP, "keys", "otc_private_key_3k.pem")
},
{
"name": "mtl",
"PLAT_CONFIG": "intel_adsp_ace15_mtpm",
"XTENSA_CORE": "ace10_LX7HiFi4_RI_2020_5",
"XTENSA_TOOLS_VERSION": f"RI-2020.5{xtensa_tools_version_postfix}",
"XTENSA_CORE": "ace10_LX7HiFi4_2022_10",
"XTENSA_TOOLS_VERSION": f"RI-2022.10{xtensa_tools_version_postfix}",
"DEFAULT_TOOLCHAIN_VARIANT": "xt-clang",
"RIMAGE_KEY": pathlib.Path(SOF_TOP, "keys", "otc_private_key_3k.pem")
},
# NXP platforms
Expand Down Expand Up @@ -542,7 +549,8 @@ def build_platforms():
"or is not a directory")

# set variables expected by zephyr/cmake/toolchain/xcc/generic.cmake
os.environ["ZEPHYR_TOOLCHAIN_VARIANT"] = "xcc"
os.environ["ZEPHYR_TOOLCHAIN_VARIANT"] = os.environ.get("ZEPHYR_TOOLCHAIN_VARIANT",
platform_dict["DEFAULT_TOOLCHAIN_VARIANT"])
XTENSA_TOOLCHAIN_PATH = str(pathlib.Path(xtensa_tools_root_dir, "install",
"tools").absolute())
os.environ["XTENSA_TOOLCHAIN_PATH"] = XTENSA_TOOLCHAIN_PATH
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ manifest:

- name: zephyr
repo-path: zephyr
revision: 9af2789cad17924298d705b99a1bca5f35ea88e2
revision: e3ae110a05d3427647a03fcbeff4478c195c5a48
remote: zephyrproject
# Import some projects listed in zephyr/west.yml@revision
#
Expand Down
4 changes: 4 additions & 0 deletions zephyr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ endif()

# SOF module init
zephyr_library_named(modules_sof)

# Zephyr C++ code requires 14 or newer standard
set_property(TARGET modules_sof PROPERTY CXX_STANDARD 17)

zephyr_include_directories(
include
)
Expand Down