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>

app/sample.yaml

@@ -11,19 +11,19 @@ tests:
     tags: sof
     build_only: true
     platform_allow:
-      - intel_adsp_cavs25
-      - intel_adsp_ace15_mtpm
-      - intel_adsp_ace20_lnl
-      - nxp_adsp_imx8
-      - nxp_adsp_imx8x
-      - nxp_adsp_imx8m
-      - nxp_adsp_imx8ulp
+      - intel_adsp/cavs25
+      - intel_adsp/ace15_mtpm
+      - intel_adsp/ace20_lnl
+      - imx8qm_mek/mimx8qm6/adsp
+      - imx8qxp_mek/mimx8qx6/adsp
+      - imx8mp_evk/mimx8ml8/adsp
+      - imx8ulp_evk/imx8ulp/adsp
 
     integration_platforms:
-      - intel_adsp_cavs25  # TGL
-      - intel_adsp_ace15_mtpm  # MTL
-      - intel_adsp_ace20_lnl
-      - nxp_adsp_imx8
-      - nxp_adsp_imx8x
-      - nxp_adsp_imx8m
-      - nxp_adsp_imx8ulp
+      - intel_adsp/cavs25  # TGL
+      - intel_adsp/ace15_mtpm  # MTL
+      - intel_adsp/ace20_lnl
+      - imx8qm_mek/mimx8qm6/adsp
+      - imx8qxp_mek/mimx8qx6/adsp
+      - imx8mp_evk/mimx8ml8/adsp
+      - imx8ulp_evk/imx8ulp/adsp

scripts/xtensa-build-zephyr.py

@@ -90,56 +90,56 @@ class PlatformConfig:
 platform_configs_all = {
 	#  Intel platforms
 	"tgl" : PlatformConfig(
-		"intel", "intel_adsp_cavs25",
+		"intel", "intel_adsp/cavs25",
 		f"RG-2017.8{xtensa_tools_version_postfix}",
 		"cavs2x_LX6HiFi3_2017_8",
 		"xcc",
 		aliases = ['adl', 'adl-n', 'ehl', 'rpl'],
 		ipc4 = True
 	),
 	"tgl-h" : PlatformConfig(
-		"intel", "intel_adsp_cavs25_tgph",
+		"intel", "intel_adsp/cavs25/tgph",
 		f"RG-2017.8{xtensa_tools_version_postfix}",
 		"cavs2x_LX6HiFi3_2017_8",
 		"xcc",
 		aliases = ['adl-s', 'rpl-s'],
 		ipc4 = True
 	),
 	"mtl" : PlatformConfig(
-		"intel", "intel_adsp_ace15_mtpm",
+		"intel", "intel_adsp/ace15_mtpm",
 		f"RI-2022.10{xtensa_tools_version_postfix}",
 		"ace10_LX7HiFi4_2022_10",
 		aliases = ['arl', 'arl-s'],
 		ipc4 = True
 	),
 	"lnl" : PlatformConfig(
-		"intel", "intel_adsp_ace20_lnl",
+		"intel", "intel_adsp/ace20_lnl",
 		f"RI-2022.10{xtensa_tools_version_postfix}",
 		"ace10_LX7HiFi4_2022_10",
 		ipc4 = True
 	),
 
 	#  NXP platforms
 	"imx8" : PlatformConfig(
-		"imx", "nxp_adsp_imx8",
+		"imx", "imx8qm_mek/mimx8qm6/adsp",
 		f"RI-2023.11{xtensa_tools_version_postfix}",
 		"hifi4_nxp_v5_3_1_prod",
 		RIMAGE_KEY = "key param ignored by imx8",
 	),
 	"imx8x" : PlatformConfig(
-		"imx", "nxp_adsp_imx8x",
+		"imx", "imx8qxp_mek/mimx8qx6/adsp",
 		f"RI-2023.11{xtensa_tools_version_postfix}",
 		"hifi4_nxp_v5_3_1_prod",
 		RIMAGE_KEY = "key param ignored by imx8x"
 	),
 	"imx8m" : PlatformConfig(
-		"imx", "nxp_adsp_imx8m",
+		"imx", "imx8mp_evk/mimx8ml8/adsp",
 		f"RI-2023.11{xtensa_tools_version_postfix}",
 		"hifi4_mscale_v2_0_2_prod",
 		RIMAGE_KEY = "key param ignored by imx8m"
 	),
 	"imx8ulp" : PlatformConfig(
-		"imx", "nxp_adsp_imx8ulp",
+		"imx", "imx8ulp_evk/imx8ulp/adsp",
 		f"RI-2023.11{xtensa_tools_version_postfix}",
 		"hifi4_nxp2_s7_v2_1a_prod",
 		RIMAGE_KEY = "key param ignored by imx8ulp"
@@ -894,7 +894,7 @@ def build_platforms():
 
 	# cavstool and friends
 	shutil.copytree(pathlib.Path(west_top) /
-			  "zephyr" / "soc" / "xtensa" / "intel_adsp" / "tools",
+			  "zephyr" / "soc" / "intel" / "intel_adsp" / "tools",
 			tools_output_dir,
 			symlinks=True, ignore_dangling_symlinks=True, dirs_exist_ok=True)
 

src/audio/base_fw.c

@@ -13,7 +13,7 @@
 #include <sof/lib/cpu.h>
 #include <rtos/init.h>
 #include <platform/lib/clk.h>
-#if defined(CONFIG_SOC_SERIES_INTEL_ACE)
+#if defined(CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
 #include <intel_adsp_hda.h>
 #endif
 
@@ -24,7 +24,7 @@
 #include <zephyr/logging/log_ctrl.h>
 
 /* TODO: Remove platform-specific code, see https://github.com/thesofproject/sof/issues/7549 */
-#if defined(CONFIG_SOC_SERIES_INTEL_ACE) || defined(CONFIG_INTEL_ADSP_CAVS)
+#if defined(CONFIG_SOC_SERIES_INTEL_ADSP_ACE) || defined(CONFIG_INTEL_ADSP_CAVS)
 # define INTEL_ADSP 1
 #endif
 
@@ -421,7 +421,7 @@ static int basefw_power_state_info_get(uint32_t *data_offset, char *data)
 
 static int fw_config_set_force_l1_exit(const struct sof_tlv *tlv)
 {
-#if defined(CONFIG_SOC_SERIES_INTEL_ACE)
+#if defined(CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
 	const uint32_t force = tlv->value[0];
 
 	if (force) {

src/ipc/CMakeLists.txt

@@ -19,7 +19,7 @@ zephyr_library_sources(
 	dma-copy.c
 )
 
-if (CONFIG_SOC_SERIES_INTEL_CAVS_V25 OR CONFIG_SOC_SERIES_INTEL_ACE)
+if (CONFIG_SOC_SERIES_INTEL_CAVS_V25 OR CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
 	zephyr_library_sources(
 		ipc-zephyr.c
 	)

src/ipc/ipc4/helper.c

@@ -25,7 +25,7 @@
 #include <rtos/wait.h>
 
 /* TODO: Remove platform-specific code, see https://github.com/thesofproject/sof/issues/7549 */
-#if defined(CONFIG_SOC_SERIES_INTEL_ACE) || defined(CONFIG_INTEL_ADSP_CAVS)
+#if defined(CONFIG_SOC_SERIES_INTEL_ADSP_ACE) || defined(CONFIG_INTEL_ADSP_CAVS)
 #define RIMAGE_MANIFEST 1
 #endif
 

west.yml

@@ -43,9 +43,8 @@ manifest:
 
     - name: zephyr
       repo-path: zephyr
-      # commit in sof/main-rebase-20240305
-      revision: f26f0bc09893616ccda461c815f083c4ce8cfcec
-      remote: thesofproject
+      revision: f9f44b6dcdd4b80765df8922e8d12fdb9213e13a
+      remote: zephyrproject
 
       # Import some projects listed in zephyr/west.yml@revision
       #

zephyr/CMakeLists.txt

@@ -178,7 +178,7 @@ if (CONFIG_SOC_SERIES_INTEL_CAVS_V25)
 endif()
 
 # Intel ACE 1.5 and newer platforms
-if (CONFIG_SOC_SERIES_INTEL_ACE)
+if (CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
 
 	# Platform sources
 	zephyr_library_sources(
@@ -232,7 +232,7 @@ if (CONFIG_SOC_SERIES_INTEL_ACE)
 endif()
 
 # NXP IMX8 platforms
-if (CONFIG_SOC_SERIES_NXP_IMX8)
+if (CONFIG_SOC_MIMX8QM_ADSP OR CONFIG_SOC_MIMX8QXP_ADSP)
 	zephyr_library_sources(
 		${SOF_DRIVERS_PATH}/generic/dummy-dma.c
 		${SOF_DRIVERS_PATH}/imx/edma.c
@@ -261,7 +261,7 @@ if (CONFIG_SOC_SERIES_NXP_IMX8)
 	set(PLATFORM "imx8")
 endif()
 
-if (CONFIG_SOC_SERIES_NXP_IMX8M)
+if (CONFIG_SOC_MIMX8MP_ADSP)
 	zephyr_library_sources(
 		${SOF_DRIVERS_PATH}/generic/dummy-dma.c
 		${SOF_DRIVERS_PATH}/imx/sdma.c
@@ -290,7 +290,7 @@ if (CONFIG_SOC_SERIES_NXP_IMX8M)
 	set(PLATFORM "imx8m")
 endif()
 
-if (CONFIG_SOC_SERIES_NXP_IMX8ULP)
+if (CONFIG_SOC_MIMX8ULP_ADSP)
 	zephyr_library_sources(
 		${SOF_DRIVERS_PATH}/generic/dummy-dma.c
 		${SOF_DRIVERS_PATH}/imx/edma.c
@@ -318,7 +318,7 @@ if (CONFIG_SOC_SERIES_NXP_IMX8ULP)
 	set(PLATFORM "imx8ulp")
 endif()
 
-if (CONFIG_SOC_SERIES_MIMX9_A55)
+if (CONFIG_SOC_MIMX9352_A55)
 	# Platform sources
 	zephyr_library_sources(
 		${SOF_PLATFORM_PATH}/imx93_a55/platform.c