Skip to content

Commit 95bdd09

Browse files
west.yml: update Zephyr to 1f55be8b42df
Contains the following squashed SOF commits: nxp: imx8ulp: change SOC name to MIMX8UD7 zephyr: CMakeLists.txt use new `CONFIG_SOC_C` for 8ULP cmake: update configs for NXP ADSP and the following Zephyr patches affecting SOF: 951763939034 nxp: imx8ulp: change SOC name to MIMX8UD7 b8214b673970 dts: xtensa: nxp_imx8: add SAI1 node a0e32f07ef76 dts: intel_adsp: ace: update host dma copy alignment 3fde2c50c6ef tracing: add intel ADSP memory window backend 6b9d01f995c7 intel_adsp/ace: power: No pending transaction before power gate 6ea749de5283 arch: rename arch_start_cpu() to arch_cpu_start() b69d2486fee6 kernel: rename Z_KERNEL_STACK_BUFFER to K_KERNEL_STACK_BUFFER 1f55be8b42df nxp: imx8: change CONFIG_SOC_<name> to match the value 688fbb53aeb2 intel_adsp: ace: Fix sparse error Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com> Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
1 parent 41bdc0c commit 95bdd09

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

app/sample.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ tests:
1717
- imx8qm_mek/mimx8qm6/adsp
1818
- imx8qxp_mek/mimx8qx6/adsp
1919
- imx8mp_evk/mimx8ml8/adsp
20-
- imx8ulp_evk/imx8ulp/adsp
20+
- imx8ulp_evk/mimx8ud7/adsp
2121

2222
integration_platforms:
2323
- intel_adsp/cavs25 # TGL
@@ -26,4 +26,4 @@ tests:
2626
- imx8qm_mek/mimx8qm6/adsp
2727
- imx8qxp_mek/mimx8qx6/adsp
2828
- imx8mp_evk/mimx8ml8/adsp
29-
- imx8ulp_evk/imx8ulp/adsp
29+
- imx8ulp_evk/mimx8ud7/adsp

scripts/xtensa-build-zephyr.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class PlatformConfig:
139139
RIMAGE_KEY = "key param ignored by imx8m"
140140
),
141141
"imx8ulp" : PlatformConfig(
142-
"imx", "imx8ulp_evk/imx8ulp/adsp",
142+
"imx", "imx8ulp_evk/mimx8ud7/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"

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ manifest:
4343

4444
- name: zephyr
4545
repo-path: zephyr
46-
revision: 66b475a3aa4d73f4ddd5be5a7a1e0f3c7028e539
46+
revision: 1f55be8b42dfd54308038d1e422d8d4e0e7f39ab
4747
remote: zephyrproject
4848

4949
# Import some projects listed in zephyr/west.yml@revision

zephyr/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ if (CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
232232
endif()
233233

234234
# NXP IMX8 platforms
235-
if (CONFIG_SOC_MIMX8QM_ADSP OR CONFIG_SOC_MIMX8QXP_ADSP)
235+
if (CONFIG_SOC_MIMX8QM6_ADSP OR CONFIG_SOC_MIMX8QX6_ADSP)
236236
zephyr_library_sources(
237237
${SOF_DRIVERS_PATH}/generic/dummy-dma.c
238238
${SOF_DRIVERS_PATH}/imx/edma.c
@@ -261,7 +261,7 @@ if (CONFIG_SOC_MIMX8QM_ADSP OR CONFIG_SOC_MIMX8QXP_ADSP)
261261
set(PLATFORM "imx8")
262262
endif()
263263

264-
if (CONFIG_SOC_MIMX8MP_ADSP)
264+
if (CONFIG_SOC_MIMX8ML8_ADSP)
265265
zephyr_library_sources(
266266
${SOF_DRIVERS_PATH}/generic/dummy-dma.c
267267
${SOF_DRIVERS_PATH}/imx/sdma.c
@@ -290,7 +290,7 @@ if (CONFIG_SOC_MIMX8MP_ADSP)
290290
set(PLATFORM "imx8m")
291291
endif()
292292

293-
if (CONFIG_SOC_MIMX8ULP_ADSP)
293+
if (CONFIG_SOC_MIMX8UD7_ADSP)
294294
zephyr_library_sources(
295295
${SOF_DRIVERS_PATH}/generic/dummy-dma.c
296296
${SOF_DRIVERS_PATH}/imx/edma.c

0 commit comments

Comments
 (0)