diff --git a/src/platform/imx93_a55/linker/data-sections.ld b/src/platform/imx93_a55/linker/data-sections.ld
new file mode 100644
index 000000000000..9efabbbb2aa9
--- /dev/null
+++ b/src/platform/imx93_a55/linker/data-sections.ld
@@ -0,0 +1,15 @@
+SECTION_PROLOGUE(.static_uuid_entries,,)
+{
+	*(*.static_uuids)
+} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
+
+SECTION_PROLOGUE(.static_log_entries,,)
+{
+	*(*.static_log*)
+} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
+
+SECTION_PROLOGUE(.fw_metadata,,)
+{
+	KEEP (*(*.fw_metadata))
+	. = ALIGN(16);
+} GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION)
diff --git a/src/platform/imx93_a55/linker/rwdata.ld b/src/platform/imx93_a55/linker/rwdata.ld
new file mode 100644
index 000000000000..2692c40dfbf6
--- /dev/null
+++ b/src/platform/imx93_a55/linker/rwdata.ld
@@ -0,0 +1,3 @@
+_trace_ctx_start = ABSOLUTE(.);
+*(.trace_ctx)
+_trace_ctx_end = ABSOLUTE(.);
diff --git a/west.yml b/west.yml
index e2f9502251c8..c8800d9aad6c 100644
--- a/west.yml
+++ b/west.yml
@@ -43,7 +43,7 @@ manifest:
 
     - name: zephyr
       repo-path: zephyr
-      revision: 689d1edee1d57f052b1d4572d67618c0b0e2b8a4
+      revision: 3f2790b89ca54ec2fb7854fd5242c2c3f04b6372
       remote: zephyrproject
 
       # Import some projects listed in zephyr/west.yml@revision
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
index 80c055e90fb1..9e344fc9f4cb 100644
--- a/zephyr/CMakeLists.txt
+++ b/zephyr/CMakeLists.txt
@@ -393,6 +393,14 @@ if (CONFIG_SOC_MIMX9352_A55)
 		${SOF_SRC_PATH}/schedule/zephyr_ll.c
 	)
 
+	# SOF-specific linker script additions
+	zephyr_linker_sources(RWDATA
+	  ${sof_top_dir}/src/platform/imx93_a55/linker/rwdata.ld
+	)
+	zephyr_linker_sources(DATA_SECTIONS
+	  ${sof_top_dir}/src/platform/imx93_a55/linker/data-sections.ld
+	)
+
 	set(PLATFORM "imx93_a55")
 endif()