Merge "[rdk-b][common][bsp][Add iwinfo in image and sync flow]"
diff --git a/conf/machine/filogic830-32bit.conf b/conf/machine/filogic830-32bit.conf
index 8be8ce7..9fa436a 100644
--- a/conf/machine/filogic830-32bit.conf
+++ b/conf/machine/filogic830-32bit.conf
@@ -32,6 +32,7 @@
DISTRO_FEATURES_append = " kernel_in_ubi"
#DISTRO_FEATURES_append = " switch_gsw_mode"
DISTRO_FEATURES_append = " fwupgrade_manager"
+DISTRO_FEATURES_append = " flow_offload"
# kernel 5.4 gold linker 'arm-rdk-linux-gnueabi-ld' not supported
#DISTRO_FEATURES_append = " referencepltfm "
#DISTRO_FEATURES_remove = " ld-is-gold"
diff --git a/conf/machine/filogic830.conf b/conf/machine/filogic830.conf
index 316e8af..1c59f9f 100644
--- a/conf/machine/filogic830.conf
+++ b/conf/machine/filogic830.conf
@@ -32,6 +32,7 @@
DISTRO_FEATURES_append = " kernel_in_ubi"
#DISTRO_FEATURES_append = " switch_gsw_mode"
DISTRO_FEATURES_append = " fwupgrade_manager"
+DISTRO_FEATURES_append = " flow_offload"
# kernel 5.4 gold linker 'arm-rdk-linux-gnueabi-ld' not supported
#DISTRO_FEATURES_append = " referencepltfm "
#DISTRO_FEATURES_remove = " ld-is-gold"
diff --git a/conf/machine/filogic880.conf b/conf/machine/filogic880.conf
index d5db8b8..fd73e89 100644
--- a/conf/machine/filogic880.conf
+++ b/conf/machine/filogic880.conf
@@ -32,6 +32,7 @@
DISTRO_FEATURES_append = " kernel_in_ubi"
DISTRO_FEATURES_append = " switch_gsw_mode"
DISTRO_FEATURES_append = " fwupgrade_manager"
+DISTRO_FEATURES_append = " flow_offload"
# kernel 5.4 gold linker 'arm-rdk-linux-gnueabi-ld' not supported
#DISTRO_FEATURES_append = " referencepltfm "
#DISTRO_FEATURES_remove = " ld-is-gold"
diff --git a/mtk_scripts/filogic-sync-openwrt-linux.sh b/mtk_scripts/filogic-sync-openwrt-linux.sh
index 0d0faa2..efbd39c 100755
--- a/mtk_scripts/filogic-sync-openwrt-linux.sh
+++ b/mtk_scripts/filogic-sync-openwrt-linux.sh
@@ -82,6 +82,11 @@
cp -rf openwrt/target/linux/mediatek/flow_patch meta-filogic/recipes-kernel/linux/linux-mediatek-5.4/mediatek
#end
+#update kernel version
+ver=`grep "LINUX_KERNEL_HASH-5" openwrt/include/kernel-version.mk | cut -c 19-25`
+sed -i 's/LINUX_VERSION ?=.*/LINUX_VERSION ?= "'${ver}'"/g' meta-filogic/recipes-kernel/linux/linux-mediatek_5.4.bb
+#end
+
echo "Update switch tool ...... "
cp -rf mtk_openwrt_feeds/feed/switch/src meta-filogic/recipes-devtools/switch/files/