[rdkb][common][misc][Refactor filogic830 conf]

[Description]
Refactor filogic830 conf

[Release-log]

Change-Id: I20ee045dd8bde79b3bb97db561c2b46de58f3e4c
diff --git a/conf/distro/include/rdk-filogic.inc b/conf/distro/include/rdk-filogic.inc
index e982ce5..a0cc35f 100644
--- a/conf/distro/include/rdk-filogic.inc
+++ b/conf/distro/include/rdk-filogic.inc
@@ -35,5 +35,6 @@
 #DISTRO_FEATURES_append = " easymesh-controller"
 #DISTRO_FEATURES_append = " emmc"
 #DISTRO_FEATURES_append = " samba"
+DISTRO_FEATURES_append = " three_gmac"
 HOSTTOOLS += " python"
 
diff --git a/conf/machine/filogic830-32bit.conf b/conf/machine/filogic830-32bit.conf
index 5e67a1f..ee0cf0e 100644
--- a/conf/machine/filogic830-32bit.conf
+++ b/conf/machine/filogic830-32bit.conf
@@ -39,6 +39,7 @@
 # kernel 5.4 gold linker 'arm-rdk-linux-gnueabi-ld' not supported
 #DISTRO_FEATURES_append = " referencepltfm "
 #DISTRO_FEATURES_remove = " ld-is-gold"
+DISTRO_FEATURES_remove = " three_gmac"
 BBMASK .= "|meta-filogic-logan/recipes-wifi/"
 #for sdk support
 INHERIT_append = " uninative"
diff --git a/conf/machine/filogic830-onewifi.conf b/conf/machine/filogic830-onewifi.conf
index 958fe48..bdd53d4 100644
--- a/conf/machine/filogic830-onewifi.conf
+++ b/conf/machine/filogic830-onewifi.conf
@@ -48,6 +48,7 @@
 # kernel 5.4 gold linker 'arm-rdk-linux-gnueabi-ld' not supported
 #DISTRO_FEATURES_append = " referencepltfm "
 #DISTRO_FEATURES_remove = " ld-is-gold"
+DISTRO_FEATURES_remove = " three_gmac"
 BBMASK .= "|meta-filogic-logan/recipes-wifi/"
 BBMASK .= "|meta-filogic/recipes-wifi/hal/"
 BBMASK .= "|meta-filogic/recipes-wifi/wpa-supplicant/"
diff --git a/conf/machine/filogic830-swpath.conf b/conf/machine/filogic830-swpath.conf
index ad083e3..208175a 100644
--- a/conf/machine/filogic830-swpath.conf
+++ b/conf/machine/filogic830-swpath.conf
@@ -47,6 +47,7 @@
 # kernel 5.4 gold linker 'arm-rdk-linux-gnueabi-ld' not supported
 #DISTRO_FEATURES_append = " referencepltfm "
 #DISTRO_FEATURES_remove = " ld-is-gold"
+DISTRO_FEATURES_remove = " three_gmac"
 BBMASK .= "|meta-filogic-logan/recipes-wifi/"
 #for sdk support
 INHERIT_append = " uninative"
diff --git a/conf/machine/filogic830.conf b/conf/machine/filogic830.conf
index 5b732a5..8b0192a 100644
--- a/conf/machine/filogic830.conf
+++ b/conf/machine/filogic830.conf
@@ -47,6 +47,7 @@
 # kernel 5.4 gold linker 'arm-rdk-linux-gnueabi-ld' not supported
 #DISTRO_FEATURES_append = " referencepltfm "
 #DISTRO_FEATURES_remove = " ld-is-gold"
+DISTRO_FEATURES_remove = " three_gmac"
 BBMASK .= "|meta-filogic-logan/recipes-wifi/"
 #for sdk support
 INHERIT_append = " uninative"
diff --git a/recipes-core/images/rdk-generic-broadband-image.bbappend b/recipes-core/images/rdk-generic-broadband-image.bbappend
index 74c7ba3..8ded315 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 mediatek-eth-firmware "
+IMAGE_INSTALL_append += " marvell-eth-firmware mediatek-eth-firmware airoha-eth-firmware "
 
 
 BB_HASH_IGNORE_MISMATCH = "1"