Merge "[[rdkb][common][config] add ccn34 project]"
diff --git a/conf/machine/filogic880-logan-be7200-ccn34.conf b/conf/machine/filogic880-logan-be7200-ccn34.conf
new file mode 100644
index 0000000..92c23ab
--- /dev/null
+++ b/conf/machine/filogic880-logan-be7200-ccn34.conf
@@ -0,0 +1,12 @@
+#@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
+include conf/machine/filogic880-logan-be7200.conf
+
+DISTRO_FEATURES_append = " ccn34"
+DISTRO_FEATURES_remove = " meshwifi"
+
diff --git a/conf/machine/filogic880-logan-ccn34.conf b/conf/machine/filogic880-logan-ccn34.conf
new file mode 100644
index 0000000..ac2436e
--- /dev/null
+++ b/conf/machine/filogic880-logan-ccn34.conf
@@ -0,0 +1,13 @@
+#@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
+include conf/machine/filogic880-logan.conf
+
+DISTRO_FEATURES_append = " ccn34"
+DISTRO_FEATURES_append = " eagle"
+DISTRO_FEATURES_remove = " meshwifi"
+
diff --git a/conf/machine/filogic880-logan_2022q3-ccn34.conf b/conf/machine/filogic880-logan_2022q3-ccn34.conf
new file mode 100644
index 0000000..401e486
--- /dev/null
+++ b/conf/machine/filogic880-logan_2022q3-ccn34.conf
@@ -0,0 +1,13 @@
+#@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
+include conf/machine/filogic880-logan_2022q3.conf
+
+DISTRO_FEATURES_append = " ccn34"
+DISTRO_FEATURES_append = " eagle"
+DISTRO_FEATURES_remove = " meshwifi"
+
diff --git a/recipes-core/packagegroups/packagegroup-filogic-logan.bb b/recipes-core/packagegroups/packagegroup-filogic-logan.bb
index 1b253c5..7d520ee 100644
--- a/recipes-core/packagegroups/packagegroup-filogic-logan.bb
+++ b/recipes-core/packagegroups/packagegroup-filogic-logan.bb
@@ -24,9 +24,9 @@
datconf \
iwinfo \
iw \
- warp \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'ccn34', '', 'warp', d)} \
mt-wifi7 \
- mt-hwifi\
+ mt-hwifi \
mt-wifi-cmn \
mtfwd \
logan-insmod \