diff --git a/app/boards/imx8ulp_evk_imx8ulp_adsp.conf b/app/boards/imx8ulp_evk_mimx8ud7_adsp.conf similarity index 100% rename from app/boards/imx8ulp_evk_imx8ulp_adsp.conf rename to app/boards/imx8ulp_evk_mimx8ud7_adsp.conf diff --git a/app/sample.yaml b/app/sample.yaml index 4a1978cde083..5a4611b71449 100644 --- a/app/sample.yaml +++ b/app/sample.yaml @@ -17,7 +17,7 @@ tests: - imx8qm_mek/mimx8qm6/adsp - imx8qxp_mek/mimx8qx6/adsp - imx8mp_evk/mimx8ml8/adsp - - imx8ulp_evk/imx8ulp/adsp + - imx8ulp_evk/mimx8ud7/adsp integration_platforms: - intel_adsp/cavs25 # TGL @@ -26,4 +26,4 @@ tests: - imx8qm_mek/mimx8qm6/adsp - imx8qxp_mek/mimx8qx6/adsp - imx8mp_evk/mimx8ml8/adsp - - imx8ulp_evk/imx8ulp/adsp + - imx8ulp_evk/mimx8ud7/adsp diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py index 9418becdcd16..6d865e052aae 100755 --- a/scripts/xtensa-build-zephyr.py +++ b/scripts/xtensa-build-zephyr.py @@ -139,7 +139,7 @@ class PlatformConfig: RIMAGE_KEY = "key param ignored by imx8m" ), "imx8ulp" : PlatformConfig( - "imx", "imx8ulp_evk/imx8ulp/adsp", + "imx", "imx8ulp_evk/mimx8ud7/adsp", f"RI-2023.11{xtensa_tools_version_postfix}", "hifi4_nxp2_s7_v2_1a_prod", RIMAGE_KEY = "key param ignored by imx8ulp" diff --git a/west.yml b/west.yml index d9985c6afaab..b3ddc5a56c30 100644 --- a/west.yml +++ b/west.yml @@ -43,7 +43,7 @@ manifest: - name: zephyr repo-path: zephyr - revision: 66b475a3aa4d73f4ddd5be5a7a1e0f3c7028e539 + revision: 1f55be8b42dfd54308038d1e422d8d4e0e7f39ab remote: zephyrproject # Import some projects listed in zephyr/west.yml@revision diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index db468c258b21..777f812939cc 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -232,7 +232,7 @@ if (CONFIG_SOC_SERIES_INTEL_ADSP_ACE) endif() # NXP IMX8 platforms -if (CONFIG_SOC_MIMX8QM_ADSP OR CONFIG_SOC_MIMX8QXP_ADSP) +if (CONFIG_SOC_MIMX8QM6_ADSP OR CONFIG_SOC_MIMX8QX6_ADSP) zephyr_library_sources( ${SOF_DRIVERS_PATH}/generic/dummy-dma.c ${SOF_DRIVERS_PATH}/imx/edma.c @@ -261,7 +261,7 @@ if (CONFIG_SOC_MIMX8QM_ADSP OR CONFIG_SOC_MIMX8QXP_ADSP) set(PLATFORM "imx8") endif() -if (CONFIG_SOC_MIMX8MP_ADSP) +if (CONFIG_SOC_MIMX8ML8_ADSP) zephyr_library_sources( ${SOF_DRIVERS_PATH}/generic/dummy-dma.c ${SOF_DRIVERS_PATH}/imx/sdma.c @@ -290,7 +290,7 @@ if (CONFIG_SOC_MIMX8MP_ADSP) set(PLATFORM "imx8m") endif() -if (CONFIG_SOC_MIMX8ULP_ADSP) +if (CONFIG_SOC_MIMX8UD7_ADSP) zephyr_library_sources( ${SOF_DRIVERS_PATH}/generic/dummy-dma.c ${SOF_DRIVERS_PATH}/imx/edma.c