diff --git a/drivers/wifi/nxp/Kconfig.nxp b/drivers/wifi/nxp/Kconfig.nxp
index 2679a48c85f18..002155fa89630 100644
--- a/drivers/wifi/nxp/Kconfig.nxp
+++ b/drivers/wifi/nxp/Kconfig.nxp
@@ -807,6 +807,27 @@ config NXP_WIFI_CSI
 	help
 	  This option enable/disable channel state information collection.
 
+config NXP_LIBCSI_CM33
+	bool "Lib csi support CM33"
+	depends on NXP_WIFI_CSI_AMI
+	help
+	  Image build with lib csi support CM33.
+
+config NXP_LIBCSI_CM7_20M
+	bool "Lib csi support CM7 bandwidth 20M"
+	depends on NXP_WIFI_CSI_AMI
+	help
+	  Image build with lib csi support CM7 bandwidth 20M.
+
+config NXP_WIFI_CSI_AMI
+	bool "CSI AMI support"
+	select FPU
+	select NXP_LIBCSI_CM33 if NXP_RW610
+	select NXP_LIBCSI_CM7_20M if NXP_IW610
+	depends on NXP_WIFI_CSI
+	help
+	  This option enable/disable channel state information to calculate ambient motion index feature.
+
 config NXP_WIFI_RESET
 	bool "Wi-Fi reset"
 	default y
diff --git a/west.yml b/west.yml
index a5154435a3cdf..2691c25e6330e 100644
--- a/west.yml
+++ b/west.yml
@@ -210,7 +210,7 @@ manifest:
       groups:
         - hal
     - name: hal_nxp
-      revision: 4377ecfba52fe0ff7352eadf426b523ed3e1d27f
+      revision: pull/617/head
       path: modules/hal/nxp
       groups:
         - hal