[rdkb][common][config][Refactor logan config and sync script]
[Description]
Refactor logan config and sync script
[Release-log]
Change-Id: Iac330709701496ef166d3702a69991f549fbf8f8
diff --git a/conf/machine/filogic880-logan.conf b/conf/machine/filogic880-logan.conf
index b402d67..8d56e4a 100644
--- a/conf/machine/filogic880-logan.conf
+++ b/conf/machine/filogic880-logan.conf
@@ -48,7 +48,8 @@
#DISTRO_FEATURES_append = " referencepltfm "
#DISTRO_FEATURES_remove = " ld-is-gold"
-BBMASK .= "|meta-filogic/recipes-wifi/"
+BBMASK .= "|meta-filogic/recipes-wifi/linux-mt76/"
+BBMASK .= "|meta-filogic/recipes-wifi/linux-mac80211/"
#for sdk support
INHERIT_append = " uninative"
BB_SETSCENE_ENFORCE_WHITELIST_append = " %:* *:do_fetch *"
diff --git a/mtk_scripts/filogic-sync-openwrt-linux.sh b/mtk_scripts/filogic-sync-openwrt-linux.sh
index 54ed3a2..78c708f 100755
--- a/mtk_scripts/filogic-sync-openwrt-linux.sh
+++ b/mtk_scripts/filogic-sync-openwrt-linux.sh
@@ -21,11 +21,14 @@
cd -
#flowblock
-#remove openwrt netfiler patch for new flowblock offload
-rm -rf openwrt/target/linux/generic/pending-5.4/64*.patch
-rm -rf openwrt/target/linux/generic/hack-5.4/647-netfilter-flow-acct.patch
-rm -rf openwrt/target/linux/generic/hack-5.4/650-netfilter-add-xt_OFFLOAD-target.patch
-rm -rf openwrt/target/linux/mediatek/patches-5.4/1002-mtkhnat-add-support-for-virtual-interface-acceleration.patch
+#move openwrt nf_hnat patch for new flowblock offload
+mkdir openwrt/target/linux/mediatek/nf_hnat
+
+mv openwrt/target/linux/generic/pending-5.4/64*.patch openwrt/target/linux/mediatek/nf_hnat/
+mv openwrt/target/linux/generic/hack-5.4/647-netfilter-flow-acct.patch openwrt/target/linux/mediatek/nf_hnat/
+mv openwrt/target/linux/generic/hack-5.4/650-netfilter-add-xt_OFFLOAD-target.patch openwrt/target/linux/mediatek/nf_hnat/
+mv openwrt/target/linux/mediatek/patches-5.4/1002-mtkhnat-add-support-for-virtual-interface-acceleration.patch openwrt/target/linux/mediatek/nf_hnat/
+
#cp flowblock patch
cp -rfa mtk_openwrt_feeds/autobuild_mac80211_release/target/ ./openwrt
#find flow patch to create ext patch for rdkb kernel build
@@ -84,6 +87,10 @@
rm -rf meta-filogic/recipes-kernel/linux/linux-mediatek-5.4/mediatek/flow_patch
cp -rf openwrt/target/linux/mediatek/flow_patch meta-filogic/recipes-kernel/linux/linux-mediatek-5.4/mediatek
#end
+#nf_hnat patch
+rm -rf meta-filogic/recipes-kernel/linux/linux-mediatek-5.4/mediatek/nf_hnat
+cp -rf openwrt/target/linux/mediatek/nf_hnat meta-filogic/recipes-kernel/linux/linux-mediatek-5.4/mediatek
+#end
#update kernel version
ver=`grep "LINUX_KERNEL_HASH-5" openwrt/include/kernel-5.4 | cut -c 19-25`