Merge "[rdkb][common][apps][Fix filogic reset default fail from dmcli]"
diff --git a/conf/machine/filogic880-logan-be7200-2023q2.conf b/conf/machine/filogic880-logan-be7200-2023q2.conf
new file mode 100644
index 0000000..6383534
--- /dev/null
+++ b/conf/machine/filogic880-logan-be7200-2023q2.conf
@@ -0,0 +1,72 @@
+#@TYPE: Machine
+#@NAME: mediatek filogic
+#@NEEDED_BSPLAYERS: meta-filogic
+#@DESCRIPTION: Machine configuration for running a RDK broadband on mediatek filogic
+#@RDK_FLAVOR: rdkb
+
+include conf/machine/filogic.conf
+
+MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
+
+MACHINE_IMAGE_NAME = "rdkb-generic-broadband-image"
+
+MACHINEOVERRIDES .= ":broadband:filogic:mt7988"
+
+PREFERRED_PROVIDER_u-boot-fw-utils = "libubootenv"
+
+PREFERRED_VERSION_xfsprogs = "4.8.0"
+PREFERRED_VERSION_php_dunfell = "7.1.%"
+PREFERRED_VERSION_php-native_dunfell = "7.1.%"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-mediatek"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+PREFERRED_VERSION_linux-mediatek = "5.4.%"
+PREFERRED_VERSION_linux-libc-headers = "5.4"
+
+PREFERRED_PROVIDER_hal-wifi = "hal-wifi-logan"
+PREFERRED_VERSION_iw_filogic = "5.%"
+#wifi bsp from openwrt
+PREFERRED_VERSION_hostapd = "2.10"
+PREFERRED_VERSION_wpa-supplicant = "2.10"
+
+
+#masking files for dunfell build
+require conf/include/filogic-bbmasks.inc
+#require conf/include/rdk-external-src-platform.inc
+
+DISTRO_FEATURES_append = " meshwifi"
+DISTRO_FEATURES_append = " ipv6"
+DISTRO_FEATURES_append = " kernel_in_ubi"
+#DISTRO_FEATURES_append = " switch_gsw_mode"
+DISTRO_FEATURES_append = " fwupgrade_manager"
+#DISTRO_FEATURES_append = " mt76"
+#DISTRO_FEATURES_append = " flow_offload"
+DISTRO_FEATURES_append = " logan"
+DISTRO_FEATURES_append = " mtk_easymesh"
+# kernel 5.4 gold linker 'arm-rdk-linux-gnueabi-ld' not supported
+#DISTRO_FEATURES_append = " referencepltfm "
+#DISTRO_FEATURES_remove = " ld-is-gold"
+
+DISTRO_FEATURES_append = " 2023q2_support"
+
+DISTRO_FEATURES_append = " kite"
+
+BBMASK .= "|meta-filogic/recipes-wifi/"
+
+#for mt7992-be7200
+DISTRO_FEATURES_append = " mt7992-be7200"
+MACHINEOVERRIDES .="${@bb.utils.contains('DISTRO_FEATURES','mt7992-be7200',':mt7992-be7200','',d)}"
+#for sdk support
+INHERIT_append = " uninative"
+BB_SETSCENE_ENFORCE_WHITELIST_append = " %:* *:do_fetch *"
+
+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"
diff --git a/recipes-extended/tdkb/files/Set_properties_logan.sh b/recipes-extended/tdkb/files/Set_properties_logan.sh
index 62c646b..35b3df5 100644
--- a/recipes-extended/tdkb/files/Set_properties_logan.sh
+++ b/recipes-extended/tdkb/files/Set_properties_logan.sh
@@ -31,7 +31,7 @@
done
-echo "DEFAULT_CHANNEL_BANDWIDTH=40MHz,80MHz" >> /etc/tdk_platform.properties
+echo "DEFAULT_CHANNEL_BANDWIDTH=40MHz,160MHz" >> /etc/tdk_platform.properties
echo "RADIO_MODES_2G=n:11NGHT40MINUS:4,n:11NGHT40MINUS:8,ax:11AXHE40MINUS:32,ax:11AXHE40MINUS:0" >> /etc/tdk_platform.properties
echo "RADIO_MODES_5G=ac:11ACVHT80:16,n:11NAHT40MINUS:8,ax:11AXHE80:32,ax:11AXHE80:0" >> /etc/tdk_platform.properties
echo "getAp0DTIMInterval=1" >> /etc/tdk_platform.properties