[Change mt76 firmware to maintain in linux-mt76]
[Description]
Change mt76 firmware to maintain in linux-mt76
1. remove linux-firmware-mt76 package
2. add linux-mt76/files/src/firmware (from OpenWRT)
3. add descrition in mt76 bb to install firmware
[Release-log]
N/A
diff --git a/conf/machine/filogic830-32bit.conf b/conf/machine/filogic830-32bit.conf
index 510c23f..c1568d1 100644
--- a/conf/machine/filogic830-32bit.conf
+++ b/conf/machine/filogic830-32bit.conf
@@ -17,6 +17,7 @@
PREFERRED_VERSION_php-native_dunfell = "7.1.%"
PREFERRED_PROVIDER_hal-wifi = "hal-wifi-cfg80211"
+PREFERRED_VERSION_iw_filogic = "5.%"
#masking files for dunfell build
require conf/include/turris-bbmasks.inc
diff --git a/recipes-core/images/rdk-generic-broadband-image.bbappend b/recipes-core/images/rdk-generic-broadband-image.bbappend
index 7b98407..b2ed091 100644
--- a/recipes-core/images/rdk-generic-broadband-image.bbappend
+++ b/recipes-core/images/rdk-generic-broadband-image.bbappend
@@ -15,7 +15,6 @@
linux-mt76 \
kernel-module-mt76 \
kernel-module-mt7915e \
- linux-firmware-mt76 \
network-hotplug \
libmcrypt \
bzip2 \
diff --git a/recipes-core/images/rdk-generic-broadband-tdk-image.bbappend b/recipes-core/images/rdk-generic-broadband-tdk-image.bbappend
index 0c9a515..fb4e5b9 100644
--- a/recipes-core/images/rdk-generic-broadband-tdk-image.bbappend
+++ b/recipes-core/images/rdk-generic-broadband-tdk-image.bbappend
@@ -15,8 +15,6 @@
linux-mt76 \
kernel-module-mt76 \
kernel-module-mt7915e \
- linux-firmware-mt76 \
- linux-firmware-ath10k \
network-hotplug \
libmcrypt \
bzip2 \
diff --git a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7915_eeprom.bin b/recipes-kernel/linux-firmware/files/mt76/firmware/mt7915_eeprom.bin
deleted file mode 100644
index 007df1b..0000000
--- a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7915_eeprom.bin
+++ /dev/null
Binary files differ
diff --git a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7915_eeprom_dbdc.bin b/recipes-kernel/linux-firmware/files/mt76/firmware/mt7915_eeprom_dbdc.bin
deleted file mode 100644
index 6c0b64e..0000000
--- a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7915_eeprom_dbdc.bin
+++ /dev/null
Binary files differ
diff --git a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7915_rom_patch.bin b/recipes-kernel/linux-firmware/files/mt76/firmware/mt7915_rom_patch.bin
deleted file mode 100644
index 1c69d39..0000000
--- a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7915_rom_patch.bin
+++ /dev/null
Binary files differ
diff --git a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7915_wa.bin b/recipes-kernel/linux-firmware/files/mt76/firmware/mt7915_wa.bin
deleted file mode 100644
index 434e757..0000000
--- a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7915_wa.bin
+++ /dev/null
Binary files differ
diff --git a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7915_wm.bin b/recipes-kernel/linux-firmware/files/mt76/firmware/mt7915_wm.bin
deleted file mode 100644
index fef6005..0000000
--- a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7915_wm.bin
+++ /dev/null
Binary files differ
diff --git a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7916_eeprom.bin b/recipes-kernel/linux-firmware/files/mt76/firmware/mt7916_eeprom.bin
deleted file mode 100644
index 35b287c..0000000
--- a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7916_eeprom.bin
+++ /dev/null
Binary files differ
diff --git a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7916_rom_patch.bin b/recipes-kernel/linux-firmware/files/mt76/firmware/mt7916_rom_patch.bin
deleted file mode 100644
index 07fe11a..0000000
--- a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7916_rom_patch.bin
+++ /dev/null
Binary files differ
diff --git a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7916_wa.bin b/recipes-kernel/linux-firmware/files/mt76/firmware/mt7916_wa.bin
deleted file mode 100644
index 27caa00..0000000
--- a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7916_wa.bin
+++ /dev/null
Binary files differ
diff --git a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7916_wm.bin b/recipes-kernel/linux-firmware/files/mt76/firmware/mt7916_wm.bin
deleted file mode 100644
index 7df01ea..0000000
--- a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7916_wm.bin
+++ /dev/null
Binary files differ
diff --git a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_eeprom_mt7975_dual.bin b/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_eeprom_mt7975_dual.bin
deleted file mode 100644
index dfe5376..0000000
--- a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_eeprom_mt7975_dual.bin
+++ /dev/null
Binary files differ
diff --git a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_eeprom_mt7976.bin b/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_eeprom_mt7976.bin
deleted file mode 100644
index c821f2d..0000000
--- a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_eeprom_mt7976.bin
+++ /dev/null
Binary files differ
diff --git a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_eeprom_mt7976_dbdc.bin b/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_eeprom_mt7976_dbdc.bin
deleted file mode 100644
index 54858b0..0000000
--- a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_eeprom_mt7976_dbdc.bin
+++ /dev/null
Binary files differ
diff --git a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_eeprom_mt7976_dual.bin b/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_eeprom_mt7976_dual.bin
deleted file mode 100644
index dc0d3e4..0000000
--- a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_eeprom_mt7976_dual.bin
+++ /dev/null
Binary files differ
diff --git a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_rom_patch.bin b/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_rom_patch.bin
deleted file mode 100644
index c0185c8..0000000
--- a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_rom_patch.bin
+++ /dev/null
Binary files differ
diff --git a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_rom_patch_mt7975.bin b/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_rom_patch_mt7975.bin
deleted file mode 100644
index 936cfe8..0000000
--- a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_rom_patch_mt7975.bin
+++ /dev/null
Binary files differ
diff --git a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_wa.bin b/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_wa.bin
deleted file mode 100644
index f7914a9..0000000
--- a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_wa.bin
+++ /dev/null
Binary files differ
diff --git a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_wm.bin b/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_wm.bin
deleted file mode 100644
index 11f363f..0000000
--- a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_wm.bin
+++ /dev/null
Binary files differ
diff --git a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_wm_mt7975.bin b/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_wm_mt7975.bin
deleted file mode 100644
index 972926c..0000000
--- a/recipes-kernel/linux-firmware/files/mt76/firmware/mt7986_wm_mt7975.bin
+++ /dev/null
Binary files differ
diff --git a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
deleted file mode 100644
index 8d6a831..0000000
--- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ /dev/null
@@ -1,45 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += " \
- file://mt76 \
- "
-
-do_install_append () {
- install -d ${D}/${base_libdir}/firmware/mediatek/
-
- install -m 644 ${WORKDIR}/mt76/firmware/mt7915_rom_patch.bin ${D}${base_libdir}/firmware/mediatek/
- install -m 644 ${WORKDIR}/mt76/firmware/mt7915_wa.bin ${D}${base_libdir}/firmware/mediatek/
- install -m 644 ${WORKDIR}/mt76/firmware/mt7915_wm.bin ${D}${base_libdir}/firmware/mediatek/
- install -m 644 ${WORKDIR}/mt76/firmware/mt7915_eeprom.bin ${D}${base_libdir}/firmware/mediatek/
- install -m 644 ${WORKDIR}/mt76/firmware/mt7915_eeprom_dbdc.bin ${D}${base_libdir}/firmware/mediatek/
-
- install -m 644 ${WORKDIR}/mt76/firmware/mt7986_rom_patch.bin ${D}${base_libdir}/firmware/mediatek/
- install -m 644 ${WORKDIR}/mt76/firmware/mt7986_rom_patch_mt7975.bin ${D}${base_libdir}/firmware/mediatek/
- install -m 644 ${WORKDIR}/mt76/firmware/mt7986_wa.bin ${D}${base_libdir}/firmware/mediatek/
- install -m 644 ${WORKDIR}/mt76/firmware/mt7986_wm.bin ${D}${base_libdir}/firmware/mediatek/
- install -m 644 ${WORKDIR}/mt76/firmware/mt7986_wm_mt7975.bin ${D}${base_libdir}/firmware/mediatek/
- install -m 644 ${WORKDIR}/mt76/firmware/mt7986_eeprom_mt7975_dual.bin ${D}${base_libdir}/firmware/mediatek/
- install -m 644 ${WORKDIR}/mt76/firmware/mt7986_eeprom_mt7976_dbdc.bin ${D}${base_libdir}/firmware/mediatek/
- install -m 644 ${WORKDIR}/mt76/firmware/mt7986_eeprom_mt7976.bin ${D}${base_libdir}/firmware/mediatek/
- install -m 644 ${WORKDIR}/mt76/firmware/mt7986_eeprom_mt7976_dual.bin ${D}${base_libdir}/firmware/mediatek/
-
-}
-
-PACKAGES =+ "${PN}-mt76"
-
-FILES_${PN}-mt76 += " \
- ${base_libdir}/firmware/mediatek/mt7915_rom_patch.bin \
- ${base_libdir}/firmware/mediatek/mt7915_wa.bin \
- ${base_libdir}/firmware/mediatek/mt7915_wm.bin \
- ${base_libdir}/firmware/mediatek/mt7915_eeprom.bin \
- ${base_libdir}/firmware/mediatek/mt7915_eeprom_dbdc.bin \
- ${base_libdir}/firmware/mediatek/mt7986_rom_patch.bin\
- ${base_libdir}/firmware/mediatek/mt7986_rom_patch_mt7975.bin \
- ${base_libdir}/firmware/mediatek/mt7986_wa.bin \
- ${base_libdir}/firmware/mediatek/mt7986_wm.bin \
- ${base_libdir}/firmware/mediatek/mt7986_wm_mt7975.bin \
- ${base_libdir}/firmware/mediatek/mt7986_eeprom_mt7975_dual.bin \
- ${base_libdir}/firmware/mediatek/mt7986_eeprom_mt7976_dbdc.bin \
- ${base_libdir}/firmware/mediatek/mt7986_eeprom_mt7976.bin \
- ${base_libdir}/firmware/mediatek/mt7986_eeprom_mt7976_dual.bin \
- "