diff --git a/BSP/linux-kernel/drivers/soc/nvt/Kconfig b/BSP/linux-kernel/drivers/soc/nvt/Kconfig
index 55b76f04b..bac78372a 100755
--- a/BSP/linux-kernel/drivers/soc/nvt/Kconfig
+++ b/BSP/linux-kernel/drivers/soc/nvt/Kconfig
@@ -39,6 +39,7 @@ config NVT_HDAL_BUILD_IN_ADV
 	select NVT_HDAL_KFLOW_GFX2D
 	select NVT_HDAL_KFLOW_VIDEOSPRITE
 	select NVT_HDAL_KFLOW_AUDIOCAPTURE
+	select NVT_HDAL_KFLOW_AUDIOENC
 	select NVT_HDAL_KFLOW_AUDIOOUT
 	select NVT_HDAL_KFLOW_VIDEOOUT
 	select NVT_HDAL_ISP_ISP
diff --git a/BSP/linux-kernel/drivers/soc/nvt/nvt_hdal/Kconfig b/BSP/linux-kernel/drivers/soc/nvt/nvt_hdal/Kconfig
index de114f679..c4c178985 100755
--- a/BSP/linux-kernel/drivers/soc/nvt/nvt_hdal/Kconfig
+++ b/BSP/linux-kernel/drivers/soc/nvt/nvt_hdal/Kconfig
@@ -78,6 +78,9 @@ config NVT_HDAL_KFLOW_VIDEOSPRITE
 config NVT_HDAL_KFLOW_AUDIOCAPTURE
         bool
         default n
+config NVT_HDAL_KFLOW_AUDIOENC
+        bool
+        default n               
 config NVT_HDAL_KFLOW_AUDIOOUT
         bool
         default n        
diff --git a/BSP/linux-kernel/drivers/soc/nvt/nvt_hdal/Makefile b/BSP/linux-kernel/drivers/soc/nvt/nvt_hdal/Makefile
index a33f81439..41ed40101 100755
--- a/BSP/linux-kernel/drivers/soc/nvt/nvt_hdal/Makefile
+++ b/BSP/linux-kernel/drivers/soc/nvt/nvt_hdal/Makefile
@@ -31,6 +31,7 @@ obj-$(CONFIG_NVT_HDAL_KFLOW_VIDEOENC) += $(KFLOW_SRC_DIR)/kflow_videoenc/unit/
 obj-$(CONFIG_NVT_HDAL_KFLOW_VIDEOOUT) += $(KFLOW_SRC_DIR)/kflow_videoout/unit/
 obj-$(CONFIG_NVT_HDAL_KFLOW_GFX2D) += $(KFLOW_SRC_DIR)/kflow_gfx/
 obj-$(CONFIG_NVT_HDAL_KFLOW_AUDIOCAPTURE) += $(KFLOW_SRC_DIR)/kflow_audiocapture/unit/
+obj-$(CONFIG_NVT_HDAL_KFLOW_AUDIOENC) += $(KFLOW_SRC_DIR)/kflow_audioenc/unit/
 obj-$(CONFIG_NVT_HDAL_KFLOW_AUDIOOUT) += $(KFLOW_SRC_DIR)/kflow_audioout/unit/
 obj-$(CONFIG_NVT_HDAL_KDRV_VIDEOCODEC) += $(VENDOR_MEDIA_DIR)/nvt_vencrc/
 obj-$(CONFIG_NVT_HDAL_ISP_ISP) += $(VENDOR_ISP_DIR)/isp/
diff --git a/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/Makefile b/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/Makefile
index d7326c8ea..e9cdf26e9 100755
--- a/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/Makefile
+++ b/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/Makefile
@@ -28,7 +28,7 @@ KBUILD_EXTRA_SYMBOLS = $(shell find $(VOS_DRIVER_DIR) -name Module.symvers) $(sh
 
 #obj-m += $(MODULE_NAME).o
 
-ifeq ($(CONFIG_NVT_HDAL_KDRV_AUDIO),y)
+ifeq ($(CONFIG_NVT_HDAL_KFLOW_AUDIOENC),y)
 obj-y += $(MODULE_NAME).o
 else
 obj-m += $(MODULE_NAME).o
diff --git a/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/isf_audenc/isf_audenc_no_tracer.o b/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/isf_audenc/isf_audenc_no_tracer.o
index c6caafab6..1d4973028 100644
Binary files a/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/isf_audenc/isf_audenc_no_tracer.o and b/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/isf_audenc/isf_audenc_no_tracer.o differ
diff --git a/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/isf_audenc/isf_audenc_verinfo_no_tracer.o b/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/isf_audenc/isf_audenc_verinfo_no_tracer.o
index 866db7a52..1a172a7de 100644
Binary files a/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/isf_audenc/isf_audenc_verinfo_no_tracer.o and b/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/isf_audenc/isf_audenc_verinfo_no_tracer.o differ
diff --git a/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/linux/isf_audenc_proc.c b/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/linux/isf_audenc_proc.c
index 2383178c0..39b73138f 100755
--- a/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/linux/isf_audenc_proc.c
+++ b/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/linux/isf_audenc_proc.c
@@ -37,7 +37,7 @@ static struct seq_file *g_seq_file;
 //============================================================================
 // Global variable
 //============================================================================
-ISF_AUDENC_DRV_INFO *p_drv_info_data;
+static ISF_AUDENC_DRV_INFO *p_drv_info_data;
 
 //============================================================================
 // Function define
@@ -371,4 +371,4 @@ int isf_audenc_proc_remove(ISF_AUDENC_DRV_INFO *p_drv_info)
 		proc_remove(p_drv_info->p_proc_module_root);
 	}
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/modules.builtin b/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/modules.builtin
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/nmediarec_audenc/nmediarec_audenc_tsk_no_tracer.o b/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/nmediarec_audenc/nmediarec_audenc_tsk_no_tracer.o
index 89f5c767a..5808f82d8 100644
Binary files a/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/nmediarec_audenc/nmediarec_audenc_tsk_no_tracer.o and b/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/nmediarec_audenc/nmediarec_audenc_tsk_no_tracer.o differ
diff --git a/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/nmediarec_audenc/nvt_media_interface_no_tracer.o b/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/nmediarec_audenc/nvt_media_interface_no_tracer.o
index d13a2d8ad..a0cc29dda 100644
Binary files a/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/nmediarec_audenc/nvt_media_interface_no_tracer.o and b/code/hdal/drivers/k_flow/source/kflow_audioenc/unit/nmediarec_audenc/nvt_media_interface_no_tracer.o differ