Merge "[rdk-b][common][bsp][Refactor and sync kernel/wifi from Openwrt]"
diff --git a/recipes-wifi/linux-mac80211/files/config b/recipes-wifi/linux-mac80211/files/config
index ce3e99d..676058a 100644
--- a/recipes-wifi/linux-mac80211/files/config
+++ b/recipes-wifi/linux-mac80211/files/config
@@ -12,3 +12,7 @@
 CPTCFG_MAC80211_MESH=y
 CPTCFG_MAC80211_DEBUGFS=y
 CPTCFG_CFG80211_DEBUGFS=y
+CPTCFG_MAC80211_DEBUG_MENU=y
+CPTCFG_MAC80211_MLME_DEBUG=y
+CPTCFG_MAC80211_STA_DEBUG=y
+CPTCFG_MAC80211_HT_DEBUG=y
diff --git a/recipes-wifi/linux-mt76/linux-mt76.bb b/recipes-wifi/linux-mt76/linux-mt76.bb
index 69d67b0..81b4c62 100644
--- a/recipes-wifi/linux-mt76/linux-mt76.bb
+++ b/recipes-wifi/linux-mt76/linux-mt76.bb
@@ -123,6 +123,10 @@
     install -m 644 ${WORKDIR}/src/firmware/mt7916_wa.bin ${D}${base_libdir}/firmware/mediatek/
     install -m 644 ${WORKDIR}/src/firmware/mt7916_wm.bin ${D}${base_libdir}/firmware/mediatek/
     install -m 644 ${WORKDIR}/src/firmware/mt7916_eeprom.bin ${D}${base_libdir}/firmware/mediatek/
+}
+
+do_install_append_mt7986 () {
+    install -d ${D}/${base_libdir}/firmware/mediatek/
 
     install -m 644 ${WORKDIR}/src/firmware/mt7986_rom_patch.bin ${D}${base_libdir}/firmware/mediatek/
     install -m 644 ${WORKDIR}/src/firmware/mt7986_rom_patch_mt7975.bin ${D}${base_libdir}/firmware/mediatek/
@@ -136,6 +140,7 @@
     install -m 644 ${WORKDIR}/src/firmware/mt7986_wo_0.bin ${D}${base_libdir}/firmware/mediatek/
     install -m 644 ${WORKDIR}/src/firmware/mt7986_wo_1.bin ${D}${base_libdir}/firmware/mediatek/
 }
+
 FILES_${PN} += "${base_libdir}/firmware/mediatek/*"
 
 # Make linux-mt76 depend on all of the split-out packages.