Merge "[KITE] EasyMesh Enable"
diff --git a/conf/machine/filogic880-logan-be7200-7988d.conf b/conf/machine/filogic880-logan-be7200-7988d.conf
new file mode 100644
index 0000000..d56df9d
--- /dev/null
+++ b/conf/machine/filogic880-logan-be7200-7988d.conf
@@ -0,0 +1,73 @@
+#@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:mt7992:mt7988d"
+
+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 = " 2022q3_support"
+DISTRO_FEATURES_remove = " core-net-lib"
+
+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-ccsp/util/utopia.bbappend b/recipes-ccsp/util/utopia.bbappend
index f0c934e..3cdc0e6 100644
--- a/recipes-ccsp/util/utopia.bbappend
+++ b/recipes-ccsp/util/utopia.bbappend
@@ -11,6 +11,7 @@
file://0001-fix-lan-handler-for-filogic.patch;apply=no \
file://0003-remove-autoconf.patch;apply=no \
file://system_defaults \
+ file://0004-enable-sshd-by-default-at-bootup.patch;apply=no \
"
SRC_URI_append_dunfell = "file://0001-Work-around-for-brlan0-issue.patch;apply=no"
@@ -43,6 +44,9 @@
bbnote "Patching firewall-secure-onboard.patch"
patch -p1 < ${WORKDIR}/firewall-secure-onboard.patch || echo "ERROR or Patch already applied"
+ bbnote "Patching 0004-enable-sshd-by-default-at-bootup.patch"
+ patch -p1 < ${WORKDIR}/0004-enable-sshd-by-default-at-bootup.patch
+
touch filogic_patch_applied
fi
}
diff --git a/recipes-ccsp/util/utopia/0004-enable-sshd-by-default-at-bootup.patch b/recipes-ccsp/util/utopia/0004-enable-sshd-by-default-at-bootup.patch
new file mode 100644
index 0000000..5d3ef81
--- /dev/null
+++ b/recipes-ccsp/util/utopia/0004-enable-sshd-by-default-at-bootup.patch
@@ -0,0 +1,35 @@
+diff --git a/source/scripts/init/system/utopia_init.sh b/source/scripts/init/system/utopia_init.sh
+index 8b6533b..0450c36 100755
+--- a/source/scripts/init/system/utopia_init.sh
++++ b/source/scripts/init/system/utopia_init.sh
+@@ -441,14 +441,14 @@ wan_ifname=`sysevent get wan_ifname`
+
+ #disable telnet / ssh ports
+ iptables -A INPUT -i "$lan_ifname" -p tcp --dport 23 -j DROP
+-iptables -A INPUT -i "$lan_ifname" -p tcp --dport 22 -j DROP
++#iptables -A INPUT -i "$lan_ifname" -p tcp --dport 22 -j DROP
+ iptables -A INPUT -i "$cmdiag_ifname" -p tcp --dport 23 -j DROP
+-iptables -A INPUT -i "$cmdiag_ifname" -p tcp --dport 22 -j DROP
++#iptables -A INPUT -i "$cmdiag_ifname" -p tcp --dport 22 -j DROP
+
+ ip6tables -A INPUT -i "$lan_ifname" -p tcp --dport 23 -j DROP
+-ip6tables -A INPUT -i "$lan_ifname" -p tcp --dport 22 -j DROP
++#ip6tables -A INPUT -i "$lan_ifname" -p tcp --dport 22 -j DROP
+ ip6tables -A INPUT -i "$cmdiag_ifname" -p tcp --dport 23 -j DROP
+-ip6tables -A INPUT -i "$cmdiag_ifname" -p tcp --dport 22 -j DROP
++#ip6tables -A INPUT -i "$cmdiag_ifname" -p tcp --dport 22 -j DROP
+
+ #protect from IPv6 NS flooding
+ ip6tables -t mangle -A PREROUTING -i "$ecm_wan_ifname" -d ff00::/8 -p ipv6-icmp -m icmp6 --icmpv6-type 135 -j DROP
+@@ -698,7 +698,7 @@ syscfg set ntp_status 2
+ echo_t "[utopia][init] setting Multicast MAC before any switch configs"
+ $UTOPIA_PATH/service_multinet_exec set_multicast_mac &
+
+-if [ "$MODEL_NUM" = "DPC3939B" ] || [ "$MODEL_NUM" = "DPC3941B" ]; then
++if [ "$MODEL_NUM" = "DPC3939B" ] || [ "$MODEL_NUM" = "DPC3941B" ] || [ "$MODEL_NAME" = "Filogic" ]; then
+ echo_t "[utopia][init] started dropbear process"
+ /etc/utopia/service.d/service_sshd.sh sshd-start &
+ fi
+--
+2.18.0
+
diff --git a/recipes-core/images/rdk-generic-broadband-image.bbappend b/recipes-core/images/rdk-generic-broadband-image.bbappend
index 97ed8ea..cbc3060 100644
--- a/recipes-core/images/rdk-generic-broadband-image.bbappend
+++ b/recipes-core/images/rdk-generic-broadband-image.bbappend
@@ -52,7 +52,7 @@
"
#IMAGE_INSTALL += " opensync openvswitch mesh-agent e2fsprogs "
-IMAGE_INSTALL_append_mt7988 += " marvell-eth-firmware "
+IMAGE_INSTALL_append_mt7988 += " marvell-eth-firmware mediatek-eth-firmware "
BB_HASH_IGNORE_MISMATCH = "1"