Merge "Revert "[rdkb][common][app][Fix ccsp-dhcp-mgr build fail in 64 bits]""
diff --git a/conf/machine/filogic830-swpath.conf b/conf/machine/filogic830-swpath.conf
index a668f9b..ad083e3 100644
--- a/conf/machine/filogic830-swpath.conf
+++ b/conf/machine/filogic830-swpath.conf
@@ -55,3 +55,13 @@
BOOT_SUFFIX = "bin"
MACHINE_FEATURES = "ext2 ipsec nfs pci smbfs usbgadget usbhost vfat"
+#for secure boot support
+#DISTRO_FEATURES_append = " secure_boot"
+MACHINEOVERRIDES .="${@bb.utils.contains('DISTRO_FEATURES','secure_boot',':secureboot','',d)}"
+SECURE_BOOT_KEYNAME_secureboot = "fit_key"
+SECURE_BOOT_KEYDIR_secureboot = "${TOPDIR}/../keys"
+FIT_HASH_ALG_secureboot ="sha1"
+HASHED_BOOT_DEVICE_secureboot = "252:0"
+
+# for efuse tools
+#DISTRO_FEATURES_append = " efuse_tools"
\ No newline at end of file
diff --git a/conf/machine/filogic830.conf b/conf/machine/filogic830.conf
index ee57899..8f6685b 100644
--- a/conf/machine/filogic830.conf
+++ b/conf/machine/filogic830.conf
@@ -55,3 +55,13 @@
BOOT_SUFFIX = "bin"
MACHINE_FEATURES = "ext2 ipsec nfs pci smbfs usbgadget usbhost vfat"
+#for secure boot support
+#DISTRO_FEATURES_append = " secure_boot"
+MACHINEOVERRIDES .="${@bb.utils.contains('DISTRO_FEATURES','secure_boot',':secureboot','',d)}"
+SECURE_BOOT_KEYNAME_secureboot = "fit_key"
+SECURE_BOOT_KEYDIR_secureboot = "${TOPDIR}/../keys"
+FIT_HASH_ALG_secureboot ="sha1"
+HASHED_BOOT_DEVICE_secureboot = "252:0"
+
+# for efuse tools
+#DISTRO_FEATURES_append = " efuse_tools"
\ No newline at end of file
diff --git a/conf/machine/filogic880-logan-be7200.conf b/conf/machine/filogic880-logan-be7200.conf
index e8141a0..1384558 100644
--- a/conf/machine/filogic880-logan-be7200.conf
+++ b/conf/machine/filogic880-logan-be7200.conf
@@ -47,6 +47,11 @@
#DISTRO_FEATURES_append = " referencepltfm "
#DISTRO_FEATURES_remove = " ld-is-gold"
+DISTRO_FEATURES_append = " 2022q3_support"
+DISTRO_FEATURES_remove = " core-net-lib"
+
+DISTRO_FEATURES_append = " kite"
+
BBMASK .= "|meta-filogic/recipes-wifi/"
#for mt7992-be7200
diff --git a/mtk_scripts/filogic-sync-openwrt-linux.sh b/mtk_scripts/filogic-sync-openwrt-linux.sh
index 1c9a0d7..39ea54d 100755
--- a/mtk_scripts/filogic-sync-openwrt-linux.sh
+++ b/mtk_scripts/filogic-sync-openwrt-linux.sh
@@ -28,6 +28,7 @@
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/999-2708-mtkhnat-add-support-for-virtual-interface-acceleration.patch openwrt/target/linux/mediatek/nf_hnat/
+mv openwrt/target/linux/mediatek/patches-5.4/999-2726-mtkhnat-tnl-interface-offload-check.patch openwrt/target/linux/mediatek/nf_hnat/
#cp flowblock patch
cp -rfa mtk_openwrt_feeds/autobuild_mac80211_release/target/ ./openwrt
diff --git a/recipes-core/packagegroups/packagegroup-filogic-logan.bb b/recipes-core/packagegroups/packagegroup-filogic-logan.bb
index 962ec5b..1b253c5 100644
--- a/recipes-core/packagegroups/packagegroup-filogic-logan.bb
+++ b/recipes-core/packagegroups/packagegroup-filogic-logan.bb
@@ -31,4 +31,6 @@
mtfwd \
logan-insmod \
mwctl \
+ ated-ext \
+ switch \
"
diff --git a/recipes-core/packagegroups/packagegroup-filogic-mtk-easymesh.bb b/recipes-core/packagegroups/packagegroup-filogic-mtk-easymesh.bb
index 770c938..9a72be1 100644
--- a/recipes-core/packagegroups/packagegroup-filogic-mtk-easymesh.bb
+++ b/recipes-core/packagegroups/packagegroup-filogic-mtk-easymesh.bb
@@ -17,4 +17,5 @@
mapd \
mapfilter \
wappd \
+ libwpactrl \
"
diff --git a/recipes-networking/igmpproxy/files/igmpproxy.conf b/recipes-networking/igmpproxy/files/igmpproxy.conf
new file mode 100644
index 0000000..5f3455e
--- /dev/null
+++ b/recipes-networking/igmpproxy/files/igmpproxy.conf
@@ -0,0 +1,47 @@
+########################################################
+#
+# Example configuration file for the IgmpProxy
+# --------------------------------------------
+#
+# The configuration file must define one upstream
+# interface, and one or more downstream interfaces.
+#
+# If multicast traffic originates outside the
+# upstream subnet, the "altnet" option can be
+# used in order to define legal multicast sources.
+# (Se example...)
+#
+# The "quickleave" should be used to avoid saturation
+# of the upstream link. The option should only
+# be used if it's absolutely nessecary to
+# accurately imitate just one Client.
+#
+########################################################
+
+##------------------------------------------------------
+## Enable Quickleave mode (Sends Leave instantly)
+##------------------------------------------------------
+quickleave
+
+
+##------------------------------------------------------
+## Configuration for eth0 (Upstream Interface)
+##------------------------------------------------------
+phyint erouter0 upstream ratelimit 0 threshold 1
+ altnet 10.0.0.0/8
+ altnet 192.168.0.0/24
+
+
+##------------------------------------------------------
+## Configuration for eth1 (Downstream Interface)
+##------------------------------------------------------
+phyint brlan0 downstream ratelimit 0 threshold 1
+ altnet 10.0.0.0/8
+
+
+##------------------------------------------------------
+## Configuration for eth2 (Disabled Interface)
+##------------------------------------------------------
+#phyint eth2 disabled
+
+
diff --git a/recipes-networking/igmpproxy/igmpproxy_%.bbappend b/recipes-networking/igmpproxy/igmpproxy_%.bbappend
new file mode 100644
index 0000000..110469a
--- /dev/null
+++ b/recipes-networking/igmpproxy/igmpproxy_%.bbappend
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI_append = "file://igmpproxy.conf \
+ "
+
+do_install_append () {
+ install -p ${S}/../igmpproxy.conf ${D}/etc/
+}
+
+FILES_${PN} += "/etc/*"