From 3bbfc67230ea028ec03bc6cdc07d0547523270b5 Mon Sep 17 00:00:00 2001
From: Huang Xin <xajhuang@163.com>
Date: Sun, 29 May 2022 05:41:37 -0700
Subject: [PATCH] 1. Remove avs-device-sdk.\n2. Add NFS Client Support.

---
 .../avs-device-sdk/avs-device-sdk_1.26.0.bb   |  9 ++----
 .../images/mtk-image-aud-8516.bb              |  2 +-
 .../aud8516p1v2_consys_slc_yocto_defconfig    | 32 +++++++++++++++++++
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/meta/meta-mediatek-aud/recipes-avs/avs-device-sdk/avs-device-sdk_1.26.0.bb b/meta/meta-mediatek-aud/recipes-avs/avs-device-sdk/avs-device-sdk_1.26.0.bb
index da24f5258..b433abfe2 100644
--- a/meta/meta-mediatek-aud/recipes-avs/avs-device-sdk/avs-device-sdk_1.26.0.bb
+++ b/meta/meta-mediatek-aud/recipes-avs/avs-device-sdk/avs-device-sdk_1.26.0.bb
@@ -31,16 +31,12 @@ EXTRA_OECMAKE = "${S} -DCMAKE_SKIP_RPATH=TRUE -DBUILD_TESTING=OFF \
         -DEXTENSION_PATH=${S}/extension/avs-cpp-sdk/KWD \
         -DASPMIC_INCLUDE_DIR=${S}/extension/mic-asp-sdk/include \
     "
-
-
 inherit cmake
 
-FILES_${PN}-sampleapp = "${bindir}/SampleApp"
-
-BBCLASSEXTEND = "native"
+FILES_${PN} = "${libdir}"
 
 do_compile() {
-    make -j8 SampleApp    
+    make -j8 SampleApp   
 }
 
 do_install() {
@@ -55,6 +51,7 @@ do_install_append() {
     install -d ${D}${libdir}/pkgconfig
     install -m 0755 ${B}/SampleApp/src/SampleApp ${D}${bindir}
     install -m 0755 ${B}${libdir}/usr/lib/*.so ${D}${libdir}    
+    install -m 0755 ${B}/extension/mic-asp-sdk/libmic_asp.so ${D}${libdir}
     install -m 0755 ${B}${libdir}/usr/lib/pkgconfig/AlexaClientSDK.pc ${D}${libdir}/pkgconfig/AlexaClientSDK.pc
     chrpath -d ${D}${bindir}/SampleApp
 }
\ No newline at end of file
diff --git a/meta/meta-mediatek-mt8516/recipes-audio/images/mtk-image-aud-8516.bb b/meta/meta-mediatek-mt8516/recipes-audio/images/mtk-image-aud-8516.bb
index 834e04601..aadd0cbe7 100755
--- a/meta/meta-mediatek-mt8516/recipes-audio/images/mtk-image-aud-8516.bb
+++ b/meta/meta-mediatek-mt8516/recipes-audio/images/mtk-image-aud-8516.bb
@@ -74,7 +74,7 @@ IMAGE_INSTALL_append = " \
     libopus \
     libarchive \
     faad2 \
-    avs-device-sdk \
+    nfs-utils \
 "
 
 install_proc() {
diff --git a/src/kernel/linux/v4.4/arch/arm64/configs/aud8516p1v2_consys_slc_yocto_defconfig b/src/kernel/linux/v4.4/arch/arm64/configs/aud8516p1v2_consys_slc_yocto_defconfig
index c70dc8012..e6983fd85 100755
--- a/src/kernel/linux/v4.4/arch/arm64/configs/aud8516p1v2_consys_slc_yocto_defconfig
+++ b/src/kernel/linux/v4.4/arch/arm64/configs/aud8516p1v2_consys_slc_yocto_defconfig
@@ -502,3 +502,35 @@ CONFIG_SPI_SPIDEV=y
 CONFIG_SPI_MT65XX=y
 CONFIG_MTK_LEDS=y
 
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V2=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+# CONFIG_NFS_SWAP is not set
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=y
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_1_MIGRATION=y
+CONFIG_NFS_V4_SECURITY_LABEL=y
+# CONFIG_ROOT_NFS is not set
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFSD is not set
+CONFIG_GRACE_PERIOD=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_BACKCHANNEL=y
+# CONFIG_SUNRPC_DEBUG is not set
+# CONFIG_CEPH_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set