Skip to content

Commit 22b3518

Browse files
committed
west.yml: update Zephyr to f9f44b6dcdd
Switch back to main Zephyr repository and commit f9f44b6dcdd. This includes following squashed SOF commits that are needed to adapt to HWMv2 changes in Zephyr: zephyr: app: scripts: intel_adsp: change board names to HWMv2 zephyr: sof: update board name for HWMv2 zephyr: intel_adsp: Change ACE SoC name to HWMv2 app: boards: imx93: updates for zephyr hwmv2 Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com> Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com> Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com> Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
1 parent 7507b32 commit 22b3518

15 files changed

+35
-36
lines changed
File renamed without changes.
File renamed without changes.

app/sample.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ tests:
1111
tags: sof
1212
build_only: true
1313
platform_allow:
14-
- intel_adsp_cavs25
15-
- intel_adsp_ace15_mtpm
16-
- intel_adsp_ace20_lnl
17-
- nxp_adsp_imx8
18-
- nxp_adsp_imx8x
19-
- nxp_adsp_imx8m
20-
- nxp_adsp_imx8ulp
14+
- intel_adsp/cavs25
15+
- intel_adsp/ace15_mtpm
16+
- intel_adsp/ace20_lnl
17+
- imx8qm_mek/mimx8qm6/adsp
18+
- imx8qxp_mek/mimx8qx6/adsp
19+
- imx8mp_evk/mimx8ml8/adsp
20+
- imx8ulp_evk/imx8ulp/adsp
2121

2222
integration_platforms:
23-
- intel_adsp_cavs25 # TGL
24-
- intel_adsp_ace15_mtpm # MTL
25-
- intel_adsp_ace20_lnl
26-
- nxp_adsp_imx8
27-
- nxp_adsp_imx8x
28-
- nxp_adsp_imx8m
29-
- nxp_adsp_imx8ulp
23+
- intel_adsp/cavs25 # TGL
24+
- intel_adsp/ace15_mtpm # MTL
25+
- intel_adsp/ace20_lnl
26+
- imx8qm_mek/mimx8qm6/adsp
27+
- imx8qxp_mek/mimx8qx6/adsp
28+
- imx8mp_evk/mimx8ml8/adsp
29+
- imx8ulp_evk/imx8ulp/adsp

scripts/xtensa-build-zephyr.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,56 +90,56 @@ class PlatformConfig:
9090
platform_configs_all = {
9191
# Intel platforms
9292
"tgl" : PlatformConfig(
93-
"intel", "intel_adsp_cavs25",
93+
"intel", "intel_adsp/cavs25",
9494
f"RG-2017.8{xtensa_tools_version_postfix}",
9595
"cavs2x_LX6HiFi3_2017_8",
9696
"xcc",
9797
aliases = ['adl', 'adl-n', 'ehl', 'rpl'],
9898
ipc4 = True
9999
),
100100
"tgl-h" : PlatformConfig(
101-
"intel", "intel_adsp_cavs25_tgph",
101+
"intel", "intel_adsp/cavs25/tgph",
102102
f"RG-2017.8{xtensa_tools_version_postfix}",
103103
"cavs2x_LX6HiFi3_2017_8",
104104
"xcc",
105105
aliases = ['adl-s', 'rpl-s'],
106106
ipc4 = True
107107
),
108108
"mtl" : PlatformConfig(
109-
"intel", "intel_adsp_ace15_mtpm",
109+
"intel", "intel_adsp/ace15_mtpm",
110110
f"RI-2022.10{xtensa_tools_version_postfix}",
111111
"ace10_LX7HiFi4_2022_10",
112112
aliases = ['arl', 'arl-s'],
113113
ipc4 = True
114114
),
115115
"lnl" : PlatformConfig(
116-
"intel", "intel_adsp_ace20_lnl",
116+
"intel", "intel_adsp/ace20_lnl",
117117
f"RI-2022.10{xtensa_tools_version_postfix}",
118118
"ace10_LX7HiFi4_2022_10",
119119
ipc4 = True
120120
),
121121

122122
# NXP platforms
123123
"imx8" : PlatformConfig(
124-
"imx", "nxp_adsp_imx8",
124+
"imx", "imx8qm_mek/mimx8qm6/adsp",
125125
f"RI-2023.11{xtensa_tools_version_postfix}",
126126
"hifi4_nxp_v5_3_1_prod",
127127
RIMAGE_KEY = "key param ignored by imx8",
128128
),
129129
"imx8x" : PlatformConfig(
130-
"imx", "nxp_adsp_imx8x",
130+
"imx", "imx8qxp_mek/mimx8qx6/adsp",
131131
f"RI-2023.11{xtensa_tools_version_postfix}",
132132
"hifi4_nxp_v5_3_1_prod",
133133
RIMAGE_KEY = "key param ignored by imx8x"
134134
),
135135
"imx8m" : PlatformConfig(
136-
"imx", "nxp_adsp_imx8m",
136+
"imx", "imx8mp_evk/mimx8ml8/adsp",
137137
f"RI-2023.11{xtensa_tools_version_postfix}",
138138
"hifi4_mscale_v2_0_2_prod",
139139
RIMAGE_KEY = "key param ignored by imx8m"
140140
),
141141
"imx8ulp" : PlatformConfig(
142-
"imx", "nxp_adsp_imx8ulp",
142+
"imx", "imx8ulp_evk/imx8ulp/adsp",
143143
f"RI-2023.11{xtensa_tools_version_postfix}",
144144
"hifi4_nxp2_s7_v2_1a_prod",
145145
RIMAGE_KEY = "key param ignored by imx8ulp"
@@ -894,7 +894,7 @@ def build_platforms():
894894

895895
# cavstool and friends
896896
shutil.copytree(pathlib.Path(west_top) /
897-
"zephyr" / "soc" / "xtensa" / "intel_adsp" / "tools",
897+
"zephyr" / "soc" / "intel" / "intel_adsp" / "tools",
898898
tools_output_dir,
899899
symlinks=True, ignore_dangling_symlinks=True, dirs_exist_ok=True)
900900

0 commit comments

Comments
 (0)