Merge "Revert "[rdkb][common][app][Fix ccsp-dhcp-mgr build fail in 64 bits]""
diff --git a/conf/machine/filogic880-logan-be7200-ccn34.conf b/conf/machine/filogic880-logan-be7200-ccn34.conf
index effc48d..9206297 100644
--- a/conf/machine/filogic880-logan-be7200-ccn34.conf
+++ b/conf/machine/filogic880-logan-be7200-ccn34.conf
@@ -10,3 +10,4 @@
DISTRO_FEATURES_append = " ccn34"
DISTRO_FEATURES_remove = " meshwifi"
DISTRO_FEATURES_remove = " mtk_easymesh"
+DISTRO_FEATURES_append = " switch_gsw_mode"
diff --git a/conf/machine/filogic880-logan-ccn34.conf b/conf/machine/filogic880-logan-ccn34.conf
index 2fea8f8..053b29f 100644
--- a/conf/machine/filogic880-logan-ccn34.conf
+++ b/conf/machine/filogic880-logan-ccn34.conf
@@ -11,3 +11,4 @@
DISTRO_FEATURES_append = " eagle"
DISTRO_FEATURES_remove = " meshwifi"
DISTRO_FEATURES_remove = " mtk_easymesh"
+DISTRO_FEATURES_append = " switch_gsw_mode"
diff --git a/conf/machine/filogic880-logan_2022q3-ccn34.conf b/conf/machine/filogic880-logan_2022q3-ccn34.conf
index 545623b..31de1a9 100644
--- a/conf/machine/filogic880-logan_2022q3-ccn34.conf
+++ b/conf/machine/filogic880-logan_2022q3-ccn34.conf
@@ -11,4 +11,4 @@
DISTRO_FEATURES_append = " eagle"
DISTRO_FEATURES_remove = " meshwifi"
DISTRO_FEATURES_remove = " mtk_easymesh"
-
+DISTRO_FEATURES_append = " switch_gsw_mode"
diff --git a/recipes-core/packagegroups/packagegroup-filogic-logan.bb b/recipes-core/packagegroups/packagegroup-filogic-logan.bb
index 61a7c09..4989a89 100644
--- a/recipes-core/packagegroups/packagegroup-filogic-logan.bb
+++ b/recipes-core/packagegroups/packagegroup-filogic-logan.bb
@@ -34,6 +34,9 @@
ated-ext \
switch \
${@bb.utils.contains('DISTRO_FEATURES', 'ccn34', 'ioctl-test', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'ccn34', 'pce', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'ccn34', 'pce-insmod', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'ccn34', 'iap-test', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'ccn34', 'tops', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'ccn34', 'tops-insmod', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'ccn34', 'eip-197', '', d)} \