From 39f5acd4da9ccbb5fd656d158ef45149f699f9f8 Mon Sep 17 00:00:00 2001
From: Daniel Leung <daniel.leung@intel.com>
Date: Fri, 30 Jan 2026 10:08:02 -0800
Subject: [PATCH] app: kconfig: allow FLIX generation

This sets the toolchain kconfig to allow generating FLIX
instructions as it is disabled by default on Zephyr upstream.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
---
 app/Kconfig | 5 +++++
 west.yml    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Kconfig b/app/Kconfig
index e1f5bd67295d..49bde9cfc39e 100644
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -4,6 +4,11 @@ config SCHED_CPU_MASK_PIN_ONLY
 config SMP_BOOT_DELAY
 	default y if SMP
 
+# Allow compiler to determine whether to generate FLIX instructions.
+choice COMPILER_CODEGEN_VLIW
+        default COMPILER_CODEGEN_VLIW_AUTO if "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "xt-clang"
+endchoice
+
 source "Kconfig.zephyr"
 
 if SOC_FAMILY_INTEL_ADSP
diff --git a/west.yml b/west.yml
index eed08c27d52f..9b582c4d5c18 100644
--- a/west.yml
+++ b/west.yml
@@ -43,7 +43,7 @@ manifest:
 
     - name: zephyr
       repo-path: zephyr
-      revision: c1a2b3be459d4f34d31ae54774fd57e96438d237
+      revision: 96d9db95de80ece9ae434cab1336fb5c07863cf5
       remote: zephyrproject
 
       # Import some projects listed in zephyr/west.yml@revision