west.yml: soc: intel_adsp: Update zephyr and rename configs

softwarecki · softwarecki · commit 81fe5740e9a0 · 2026-01-23T15:42:00.000+01:00
Update zephyr to c1a2b3be45.

Rename CONFIG_SOC_INTEL_ACE* definitions to CONFIG_SOC_ACE* to match the
new naming already adopted in Zephyr.

Total of 490 commits.

Changes include:
c1a2b3be459 xtensa: Restore the EXCCAUSE register when returning from
            Double Exception
fd8188a4082 xtensa: Remove saving EXCCAUSE in BSA from _Level1Vector
61e9f9ea045 soc: intel_adsp: rename CONFIG_SOC_INTEL_ACE* to
            CONFIG_SOC_ACE*
1dae40fa2ef soc: rename CONFIG_INTEL_CAVS_V25 to CONFIG_SOC_CAVSV25
58f9d5e6c35 doc: releases: release-notes: 4.4: Add notes on new bits
d320921cd18 tests: subsys: llext: Add test for LLEXT_RODATA_NO_RELOC.

Signed-off-by: Adrian Warecki &lt;adrian.warecki@intel.com&gt;
diff --git a/src/audio/asrc/asrc.toml b/src/audio/asrc/asrc.toml
@@ -49,7 +49,7 @@
 			12, 0, 0, 0, 20480, 30050000, 384, 192, 0, 30050, 0,
 			13, 0, 0, 0, 20480, 35152000, 384, 256, 0, 35152, 0,
 			14, 0, 0, 0, 20480, 81647000, 1536, 1440, 0, 81647, 0]
-#elif CONFIG_SOC_INTEL_ACE30 || CONFIG_SOC_INTEL_ACE40
+#elif CONFIG_SOC_ACE30 || CONFIG_SOC_ACE40
 	mod_cfg = [0, 0, 0, 0, 20480, 29755000, 64, 192, 0, 29755, 0,
 			1, 0, 0, 0, 20480, 58017000, 64, 384, 0, 58017, 0,
 			2, 0, 0, 0, 20480, 103471000, 512, 1440, 0, 103471, 0,
diff --git a/src/audio/base_fw_intel.c b/src/audio/base_fw_intel.c
@@ -103,7 +103,7 @@ __cold int basefw_vendor_hw_config(uint32_t *data_offset, char *data)
 	tuple = tlv_next(tuple);
 	tlv_value_uint32_set(tuple, IPC4_LP_EBB_COUNT_HW_CFG, PLATFORM_LPSRAM_EBB_COUNT);
 
-#if defined(CONFIG_SOC_INTEL_ACE30) || defined(CONFIG_SOC_INTEL_ACE40)
+#if defined(CONFIG_SOC_ACE30) || defined(CONFIG_SOC_ACE40)
 	tuple = tlv_next(tuple);
 	tlv_value_uint32_set(tuple, IPC4_I2S_CAPS_HW_CFG, I2S_VER_30_PTL);
 #endif
diff --git a/src/audio/copier/copier.toml b/src/audio/copier/copier.toml
@@ -92,7 +92,7 @@
 			28, 0, 0, 0, 280, 6058000, 64, 64, 0, 6058, 0,
 			29, 0, 0, 0, 280, 6198000, 64, 64, 0, 6198, 0,
 			30, 0, 0, 0, 280, 6034000, 32, 32, 0, 6034, 0]
-#elif CONFIG_SOC_INTEL_ACE30 || CONFIG_SOC_INTEL_ACE40
+#elif CONFIG_SOC_ACE30 || CONFIG_SOC_ACE40
 	mod_cfg = [0, 0, 0, 0, 280, 7915000, 768, 768, 0, 7915, 0,
 			1, 0, 0, 0, 280, 9487000, 768, 768, 0, 9487, 0,
 			2, 0, 0, 0, 280, 7363000, 384, 384, 0, 7363, 0,
diff --git a/src/audio/eq_iir/eq_iir.toml b/src/audio/eq_iir/eq_iir.toml
@@ -23,8 +23,8 @@
 	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 1000, 0,
 			0, 0, 0, 0, 4096, 20663000, 768, 768, 0, 20663, 0,
 			0, 0, 0, 0, 4096, 11357000, 384, 384, 0, 11357, 0]
-#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_INTEL_ACE30) || \
-      defined(CONFIG_SOC_INTEL_ACE40)
+#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_ACE30) || \
+      defined(CONFIG_SOC_ACE40)
 	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
 #endif
 
diff --git a/src/audio/mixin_mixout/mixin_mixout.toml b/src/audio/mixin_mixout/mixin_mixout.toml
@@ -32,7 +32,7 @@
 			2, 0, 0, 0, 296, 2448000, 512, 512, 0, 2448, 0,
 			3, 0, 0, 0, 296, 2160000, 128, 128, 0, 2160, 0,
 			4, 0, 0, 0, 296, 3268000, 1536, 1536, 0, 3268, 0]
-#elif CONFIG_SOC_INTEL_ACE30 || CONFIG_SOC_INTEL_ACE40
+#elif CONFIG_SOC_ACE30 || CONFIG_SOC_ACE40
 	mod_cfg = [0, 0, 0, 0, 296, 5091000, 384, 384, 0, 5091, 0,
 			1, 0, 0, 0, 296, 5111000, 384, 384, 0, 5111, 0,
 			2, 0, 0, 0, 296, 5195000, 512, 512, 0, 5195, 0,
@@ -77,7 +77,7 @@
 			2, 0, 0, 0, 520, 7631000, 512, 512, 0, 0, 0,
 			3, 0, 0, 0, 520, 1953000, 128, 128, 0, 0, 0,
 			4, 0, 0, 0, 520, 2301000, 1536, 1536, 0, 0, 0]
-#elif CONFIG_SOC_INTEL_ACE30 || CONFIG_SOC_INTEL_ACE40
+#elif CONFIG_SOC_ACE30 || CONFIG_SOC_ACE40
 	mod_cfg = [0, 0, 0, 0, 520, 3999000, 384, 384, 0, 3999, 0,
 			1, 0, 0, 0, 520, 3999000, 384, 384, 0, 3999, 0,
 			2, 0, 0, 0, 520, 4055000, 512, 512, 0, 4055, 0,
diff --git a/src/audio/selector/selector.toml b/src/audio/selector/selector.toml
@@ -39,7 +39,7 @@
 			13, 0, 0, 0, 216, 8818000, 384, 1152, 0, 8818, 0,
 			14, 0, 0, 0, 216, 12274000, 768, 1152, 0, 12274, 0,
 			15, 0, 0, 0, 216, 19186000, 1536, 1152, 0, 19186, 0]
-#elif CONFIG_SOC_INTEL_ACE30 || CONFIG_SOC_INTEL_ACE40
+#elif CONFIG_SOC_ACE30 || CONFIG_SOC_ACE40
 	mod_cfg = [0, 0, 0, 0, 216, 2952000, 384, 192, 0, 2952, 0,
 			1, 0, 0, 0, 216, 4720000, 384, 384, 0, 4720, 0,
 			2, 0, 0, 0, 216, 5705000, 576, 384, 0, 5705, 0,
diff --git a/src/audio/src/src.toml b/src/audio/src/src.toml
@@ -72,7 +72,7 @@
 			23, 0, 0, 0, 12832, 21852000, 180, 256, 0, 21852, 0,
 			24, 0, 0, 0, 12832, 12629000, 256, 512, 0, 12629, 0,
 			25, 0, 0, 0, 12832, 13996000, 128, 256, 0, 13996, 0]
-#elif CONFIG_SOC_INTEL_ACE30 || CONFIG_SOC_INTEL_ACE40
+#elif CONFIG_SOC_ACE30 || CONFIG_SOC_ACE40
 	mod_cfg = [0, 0, 0, 0, 12832, 30633000, 128, 512, 0, 30633, 0,
 			1, 0, 0, 0, 12832, 28143000, 64, 256, 0, 28143, 0,
 			2, 0, 0, 0, 12832, 33513000, 96, 512, 0, 33513, 0,
diff --git a/src/audio/up_down_mixer/up_down_mixer.toml b/src/audio/up_down_mixer/up_down_mixer.toml
@@ -65,7 +65,7 @@
 			16, 0, 0, 0, 216, 4596000, 768, 1152, 0, 4596, 0,
 			17, 0, 0, 0, 216, 5572000, 1536, 1152, 0, 5572, 0,
 			18, 0, 0, 0, 216, 4896000, 384, 1536, 0, 4896, 0]
-#elif CONFIG_SOC_INTEL_ACE30 || CONFIG_SOC_INTEL_ACE40
+#elif CONFIG_SOC_ACE30 || CONFIG_SOC_ACE40
 	mod_cfg = [0, 0, 0, 0, 216, 4841000, 384, 192, 0, 4841, 0,
 			1, 0, 0, 0, 216, 4355000, 384, 384, 0, 4355, 0,
 			2, 0, 0, 0, 216, 5079000, 576, 384, 0, 5079, 0,
diff --git a/src/audio/volume/volume.toml b/src/audio/volume/volume.toml
@@ -31,7 +31,7 @@
 			2, 0, 0, 0, 480, 6846000, 720, 720, 0, 6846, 0,
 			3, 0, 0, 0, 480, 7212000, 768, 768, 0, 7212, 0,
 			4, 0, 0, 0, 480, 9532000, 1536, 1536, 0, 9532, 0]
-#elif CONFIG_SOC_INTEL_ACE30 || CONFIG_SOC_INTEL_ACE40
+#elif CONFIG_SOC_ACE30 || CONFIG_SOC_ACE40
 	mod_cfg = [0, 0, 0, 0, 480, 6993000, 384, 384, 0, 6993, 0,
 			1, 0, 0, 0, 480, 6385000, 192, 192, 0, 6385, 0,
 			2, 0, 0, 0, 480, 10887000, 720, 720, 0, 10887, 0,
@@ -71,7 +71,7 @@
 			2, 0, 0, 0, 416, 7882000, 512, 512, 0, 7882, 0,
 			3, 0, 0, 0, 416, 5170000, 128, 128, 0, 5170, 0,
 			4, 0, 0, 0, 416, 5908000, 768, 768, 0, 0, 0]
-#elif CONFIG_SOC_INTEL_ACE30 || CONFIG_SOC_INTEL_ACE40
+#elif CONFIG_SOC_ACE30 || CONFIG_SOC_ACE40
 	mod_cfg = [0, 0, 0, 0, 416, 11865000, 1536, 1536, 0, 11865, 0,
 			1, 0, 0, 0, 416, 7797000, 384, 384, 1, 7797, 1,
 			2, 0, 0, 0, 416, 12083000, 512, 512, 2, 12083, 2,
diff --git a/src/debug/tester/tester.toml b/src/debug/tester/tester.toml
@@ -45,8 +45,8 @@
 			23, 0, 0, 0, 12832, 27696000, 180, 256, 0, 27696, 0,
 			24, 0, 0, 0, 12832, 18368000, 256, 512, 0, 18368, 0,
 			25, 0, 0, 0, 12832, 15204000, 128, 256, 0, 15204, 0]
-#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_INTEL_ACE30) || \
-	  defined(CONFIG_SOC_INTEL_ACE40)
+#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_ACE30) || \
+	  defined(CONFIG_SOC_ACE40)
 	mod_cfg = [0, 0, 0, 0, 12832, 1365500, 0, 0, 0, 1365, 0,
 			1, 0, 0, 0, 12832, 2302300, 0, 0, 0, 2302, 0,
 			2, 0, 0, 0, 12832, 3218200, 0, 0, 0, 3218, 0,
diff --git a/src/include/ipc4/alh.h b/src/include/ipc4/alh.h
@@ -37,7 +37,7 @@
 #endif
 
 #if defined(CONFIG_SOC_SERIES_INTEL_ADSP_CAVS) || \
-	defined(CONFIG_SOC_INTEL_ACE15_MTPM)
+	defined(CONFIG_SOC_ACE15_MTPM)
 #define IPC4_DAI_NUM_ALH_BI_DIR_LINKS	16
 #define IPC4_DAI_NUM_ALH_BI_DIR_LINKS_GROUP	4
 #else
diff --git a/src/samples/audio/smart_amp_test.toml b/src/samples/audio/smart_amp_test.toml
@@ -23,8 +23,8 @@
 	REM # mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
 #ifdef CONFIG_METEORLAKE
 	mod_cfg = [0, 0, 0, 0, 296, 5000000, 384, 384, 0, 5000, 0]
-#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_INTEL_ACE30) || \
-      defined(CONFIG_SOC_INTEL_ACE40)
+#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_ACE30) || \
+      defined(CONFIG_SOC_ACE40)
 	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
 #endif
 
diff --git a/tools/rimage/config/platform.toml b/tools/rimage/config/platform.toml
@@ -2,8 +2,8 @@
 #include "platform-mtl.toml"
 #elif CONFIG_LUNARLAKE
 #include "platform-lnl.toml"
-#elif CONFIG_SOC_INTEL_ACE30
+#elif CONFIG_SOC_ACE30
 #include "platform-ptl.toml"
-#elif CONFIG_SOC_INTEL_ACE40
+#elif CONFIG_SOC_ACE40
 #include "platform-nvl.toml"
 #endif
diff --git a/west.yml b/west.yml
@@ -43,7 +43,7 @@ manifest:
 
     - name: zephyr
       repo-path: zephyr
-      revision: 7e3c5ab2bb2a9f4bf1b0afd43c872e6f19461777
+      revision: c1a2b3be459d4f34d31ae54774fd57e96438d237
       remote: zephyrproject
 
       # Import some projects listed in zephyr/west.yml@revision
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
@@ -271,19 +271,19 @@ if (CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
 		lib/dma.c
 	)
 
-	zephyr_library_sources_ifdef(CONFIG_SOC_INTEL_ACE15_MTPM
+	zephyr_library_sources_ifdef(CONFIG_SOC_ACE15_MTPM
 		${SOF_PLATFORM_PATH}/meteorlake/lib/clk.c
 	)
 
-	zephyr_library_sources_ifdef(CONFIG_SOC_INTEL_ACE20_LNL
+	zephyr_library_sources_ifdef(CONFIG_SOC_ACE20_LNL
 		${SOF_PLATFORM_PATH}/lunarlake/lib/clk.c
 	)
 
-	zephyr_library_sources_ifdef(CONFIG_SOC_INTEL_ACE30
+	zephyr_library_sources_ifdef(CONFIG_SOC_ACE30
 		${SOF_PLATFORM_PATH}/ace30/lib/clk.c
 	)
 
-	zephyr_library_sources_ifdef(CONFIG_SOC_INTEL_ACE40
+	zephyr_library_sources_ifdef(CONFIG_SOC_ACE40
 		${SOF_PLATFORM_PATH}/novalake/lib/clk.c
 	)
 
@@ -300,13 +300,13 @@ if (CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
 		${SOF_PLATFORM_PATH}/intel/ace/lib/watchdog.c
 	)
 
-	if (CONFIG_SOC_INTEL_ACE15_MTPM)
+	if (CONFIG_SOC_ACE15_MTPM)
 		set(PLATFORM "meteorlake")
-	elseif(CONFIG_SOC_INTEL_ACE20_LNL)
+	elseif(CONFIG_SOC_ACE20_LNL)
 		set(PLATFORM "lunarlake")
-	elseif(CONFIG_SOC_INTEL_ACE30)
+	elseif(CONFIG_SOC_ACE30)
 		set(PLATFORM "ace30")
-	elseif(CONFIG_SOC_INTEL_ACE40)
+	elseif(CONFIG_SOC_ACE40)
 		set(PLATFORM "novalake")
 	endif()
 
diff --git a/zephyr/Kconfig b/zephyr/Kconfig
@@ -38,8 +38,8 @@ config SOF_ZEPHYR_HEAP_CACHED
 
 config SOF_ZEPHYR_HEAP_SIZE
 	hex "Size of the Zephyr heap for SOF"
-	default 0xF0000 if SOC_INTEL_ACE15_MTPM || SOC_INTEL_ACE20_LNL
-	default 0xD0000 if SOC_INTEL_ACE30 || SOC_INTEL_ACE40
+	default 0xF0000 if SOC_ACE15_MTPM || SOC_ACE20_LNL
+	default 0xD0000 if SOC_ACE30 || SOC_ACE40
 	default 0x0
 	help
 	 Support scaling of the heap size for different platforms and different types
@@ -60,8 +60,8 @@ config SOF_USERSPACE_USE_SHARED_HEAP
 config SOF_ZEPHYR_SHARED_BUFFER_HEAP_SIZE
 	hex "Size of the shared buffer heap for SOF userspace modules"
 	default 0x0 if !SOF_USERSPACE_USE_SHARED_HEAP
-	default 0x1E000 if SOC_INTEL_ACE15_MTPM || SOC_INTEL_ACE20_LNL
-	default 0x10000 if SOC_INTEL_ACE30
+	default 0x1E000 if SOC_ACE15_MTPM || SOC_ACE20_LNL
+	default 0x10000 if SOC_ACE30
 	default 0x0
 	depends on USERSPACE
 	help
diff --git a/zephyr/lib/dma.c b/zephyr/lib/dma.c
@@ -78,13 +78,13 @@ SHARED_DATA struct sof_dma dma[] = {
 	.plat_data = {
 		.dir		= SOF_DMA_DIR_DEV_TO_MEM,
 		.caps		= SOF_DMA_CAP_HDA,
-#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30) || \
-	defined(CONFIG_SOC_INTEL_ACE40)
+#if defined(CONFIG_SOC_ACE20_LNL) || defined(CONFIG_SOC_ACE30) || \
+	defined(CONFIG_SOC_ACE40)
 		.devs		= SOF_DMA_DEV_HDA | SOF_DMA_DEV_SSP |
 					  SOF_DMA_DEV_DMIC | SOF_DMA_DEV_ALH,
 #else
 		.devs		= SOF_DMA_DEV_HDA,
-#endif /* CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30 || CONFIG_SOC_INTEL_ACE40 */
+#endif /* CONFIG_SOC_ACE20_LNL || CONFIG_SOC_ACE30 || CONFIG_SOC_ACE40 */
 		.channels	= DT_PROP(DT_NODELABEL(hda_link_in), dma_channels),
 		.period_count	= HDA_DMA_BUFFER_PERIOD_COUNT,
 	},
@@ -96,13 +96,13 @@ SHARED_DATA struct sof_dma dma[] = {
 	.plat_data = {
 		.dir		= SOF_DMA_DIR_MEM_TO_DEV,
 		.caps		= SOF_DMA_CAP_HDA,
-#if defined(CONFIG_SOC_INTEL_ACE20_LNL) || defined(CONFIG_SOC_INTEL_ACE30) || \
-	defined(CONFIG_SOC_INTEL_ACE40)
+#if defined(CONFIG_SOC_ACE20_LNL) || defined(CONFIG_SOC_ACE30) || \
+	defined(CONFIG_SOC_ACE40)
 		.devs		= SOF_DMA_DEV_HDA | SOF_DMA_DEV_SSP |
 					  SOF_DMA_DEV_DMIC | SOF_DMA_DEV_ALH,
 #else
 		.devs		= SOF_DMA_DEV_HDA,
-#endif /* CONFIG_SOC_INTEL_ACE20_LNL || CONFIG_SOC_INTEL_ACE30 || CONFIG_SOC_INTEL_ACE40 */
+#endif /* CONFIG_SOC_ACE20_LNL || CONFIG_SOC_ACE30 || CONFIG_SOC_ACE40 */
 		.channels	= DT_PROP(DT_NODELABEL(hda_link_out), dma_channels),
 		.period_count	= HDA_DMA_BUFFER_PERIOD_COUNT,
 	},
