Merging debian version 20240709-2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 23 insertions, 328 deletions

diff --git a/debian/config/mediatek/defines b/debian/config/mediatek/defines
index 9d33f97..2081634 100644
--- a/debian/config/mediatek/defines
+++ b/debian/config/mediatek/defines
@@ -1,16 +1,11 @@
 [base]
 desc: MediaTek and Ralink chips for networking, SoCs and media
-longdesc:
- MediaTek devices such as ethernet/Wi-Fi/Bluetooth chips, SoCs
+longdesc: MediaTek devices such as ethernet/Wi-Fi/Bluetooth chips, SoCs
  and other chips and devices made by MediaTek and Ralink
 support: initramfs-tools
-breaks: firmware-misc-nonfree (<< 20230625-3~)
-replaces: firmware-misc-nonfree (<< 20230625-3~)
+conflicts: firmware-misc-nonfree (<< 20230625-3~)
 files:
- mt7601u.bin
- mt7650.bin
- mt7662.bin
- mt7662_rom_patch.bin
+ mt76*
  rt73.bin
  rt2561.bin
  rt2561s.bin
@@ -23,9 +18,14 @@ files:
  rt3290.bin
  vpu_d.bin
  vpu_p.bin
+ mediatek/**/*
+usrmovemitigation:
  mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin
  mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin
- mediatek/mt7601u.bin
+ mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin
+ mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin
+ mediatek/WIFI_RAM_CODE_MT7922_1.bin
+ mediatek/WIFI_RAM_CODE_MT7961_1.bin
  mediatek/mt7610e.bin
  mediatek/mt7610u.bin
  mediatek/mt7615_cr4.bin
@@ -34,10 +34,7 @@ files:
  mediatek/mt7622_n9.bin
  mediatek/mt7622_rom_patch.bin
  mediatek/mt7622pr2h.bin
- mediatek/mt7650.bin
  mediatek/mt7650e.bin
- mediatek/mt7662.bin
- mediatek/mt7662_rom_patch.bin
  mediatek/mt7662u.bin
  mediatek/mt7662u_rom_patch.bin
  mediatek/mt7663_n9_rebb.bin
@@ -45,327 +42,25 @@ files:
  mediatek/mt7663pr2h.bin
  mediatek/mt7663pr2h_rebb.bin
  mediatek/mt7668pr2h.bin
- mediatek/mt7915_eeprom.bin
- mediatek/mt7915_eeprom_dbdc.bin
  mediatek/mt7915_rom_patch.bin
  mediatek/mt7915_wa.bin
  mediatek/mt7915_wm.bin
- mediatek/mt7916_eeprom.bin
- mediatek/mt7916_rom_patch.bin
- mediatek/mt7916_wa.bin
- mediatek/mt7916_wm.bin
- mediatek/mt7981_rom_patch.bin
- mediatek/mt7981_wa.bin
- mediatek/mt7981_wm.bin
- mediatek/mt7981_wo.bin
- mediatek/mt7986_eeprom_mt7975_dual.bin
- mediatek/mt7986_eeprom_mt7976.bin
- mediatek/mt7986_eeprom_mt7976_dbdc.bin
- mediatek/mt7986_eeprom_mt7976_dual.bin
- mediatek/mt7986_rom_patch.bin
- mediatek/mt7986_rom_patch_mt7975.bin
- mediatek/mt7986_wa.bin
- mediatek/mt7986_wm.bin
- mediatek/mt7986_wm_mt7975.bin
- mediatek/mt7986_wo_0.bin
- mediatek/mt7986_wo_1.bin
- mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin
- mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin
- mediatek/WIFI_RAM_CODE_MT7922_1.bin
- mediatek/WIFI_RAM_CODE_MT7961_1.bin
  mediatek/mt8173/vpu_d.bin
  mediatek/mt8173/vpu_p.bin
  mediatek/mt8183/scp.img
  mediatek/mt8186/scp.img
- mediatek/mt8192/scp.img
  mediatek/mt8195/scp.img
- mediatek/sof-tplg/sof-mt8186.tplg
- mediatek/sof-tplg/sof-mt8195-mt6359-rt1019-rt5682-dts.tplg
- mediatek/sof-tplg/sof-mt8195-mt6359-rt1019-rt5682.tplg
- mediatek/sof/sof-mt8186.ldc
- mediatek/sof/sof-mt8186.ri
- mediatek/sof/sof-mt8195.ldc
- mediatek/sof/sof-mt8195.ri
-
-[rt73.bin_base]
-desc: Ralink RT2571W/RT2671 (RT2501USB/RT5201USB chipset) firmware
-version: 1.8
-
-[rt2561.bin_base]
-desc: Ralink RT2561 (RT2501/RT5201 chipset) firmware
-version: 1.2
-
-[rt2561s.bin_base]
-desc: Ralink RT2561S (RT2501 Turbo/RT5201 Turbo chipset) firmware
-version: 1.2
-
-[rt2661.bin_base]
-desc: Ralink RT2661 (RT2600/RT5600 chipset) firmware
-version: 1.2
-
-[rt2860.bin_base]
-desc: Ralink RT2760/RT2790/RT2860/RT2890/RT3090 (RT2700P[D]/RT2700E[D]/RT2800P[D]/RT2800E[D]/RT3000E[D] chipset) firmware
-version: 0.40
-
-[rt2870.bin_base]
-desc: Ralink RT2870/RT3070/RT3071/RT3072 (RT2800U[D] chipset) firmware
-version: 0.36
-
-[rt3071.bin_base]
-desc: Ralink RT3071/RT3072 firmware
-version: 29
-
-[rt3290.bin_base]
-desc: Ralink RT3290 firmware
-version: 1
-
-[mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin_base]
-desc: MediaTek MT7922 Bluetooth firmware
-version: 20230530123531
-
-[mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin_base]
-desc: MediaTek MT7921 Bluetooth firmware
-version: 20230526131214
-
-[mediatek/mt7601u.bin_base]
-desc: MediaTek MT7601U Wi-Fi firmware
-version: 34
-
-[mediatek/mt7610e.bin_base]
-desc: MediaTek MT76x0 Wi-Fi firmware
-version: 2.6
-
-[mediatek/mt7610u.bin_base]
-desc: MediaTek MT76x0 Wi-Fi firmware
-version: 2.6
-
-[mediatek/mt7615_cr4.bin_base]
-desc: MediaTek MT7615e Wi-Fi firmware
-version: 20190114
-
-[mediatek/mt7615_n9.bin_base]
-desc: MediaTek MT7615e Wi-Fi firmware
-version: 20200814
-
-[mediatek/mt7615_rom_patch.bin_base]
-desc: MediaTek MT7615e Wi-Fi ROM patch
-version: 20190114
-
-[mediatek/mt7622_n9.bin_base]
-desc: MediaTek MT7622 Wi-Fi firmware
-version: 20200630
-
-[mediatek/mt7622_rom_patch.bin_base]
-desc: MediaTek MT7622 Wi-Fi ROM patch
-version: 20190114
-
-[mediatek/mt7622pr2h.bin_base]
-desc: MediaTek MT7622 Bluetooth firmware
-version: 20180621204904
-
-[mediatek/mt7650.bin_base]
-desc: MediaTek MT7630/MT7650 Bluetooth firmware
-
-[mediatek/mt7650e.bin_base]
-desc: MediaTek MT76x0 Wi-Fi firmware
-version: 1.0.07-b370
-
-[mediatek/mt7662.bin_base]
-desc: MediaTek MT76x2 Wi-Fi firmware
-version: 1.9
-
-[mediatek/mt7662_rom_patch.bin_base]
-desc: MediaTek MT76x2 Wi-Fi ROM patch
-version: 0.0.2_P69
-
-[mediatek/mt7662u.bin_base]
-desc: MediaTek MT76x2u Wi-Fi firmware
-version: 1.5
-
-[mediatek/mt7662u_rom_patch.bin_base]
-desc: MediaTek MT76x2u Wi-Fi ROM patch
-version: 0.0.2_P48
-
-[mediatek/mt7663_n9_rebb.bin_base]
-desc: MediaTek MT7663 Wi-Fi firmware
-version: 7663mp1827-20190914043434
-
-[mediatek/mt7663_n9_v3.bin_base]
-desc: MediaTek MT7663 Wi-Fi firmware
-version: v3.1.1
-
-[mediatek/mt7663pr2h.bin_base]
-desc: MediaTek MT7663 Wi-Fi firmware
-version: 7663e2ccn04-2006030247
-
-[mediatek/mt7663pr2h_rebb.bin_base]
-desc: MediaTek MT7663 Wi-Fi firmware
-version: 7663e2-1802-19091404338b809
-
-[mediatek/mt7668pr2h.bin_base]
-desc: MediaTek MT7668 Bluetooth firmware
-version: 20180517181834
-
-[mediatek/mt7915_eeprom.bin_base]
-desc: MediaTek MT7915 Wi-Fi firmware
-version: 20200821
-
-[mediatek/mt7915_eeprom_dbdc.bin_base]
-desc: MediaTek MT7915 Wi-Fi firmware
-version: 20200821
-
-[mediatek/mt7915_rom_patch.bin_base]
-desc: MediaTek MT7915 Wi-Fi ROM patch
-version: 20220929104113a
-
-[mediatek/mt7915_wa.bin_base]
-desc: MediaTek MT7915 Wi-Fi firmware
-version: 20220929104205
-
-[mediatek/mt7915_wm.bin_base]
-desc: MediaTek MT7915 Wi-Fi firmware
-version: 20220929104145
-
-[mediatek/mt7916_eeprom.bin_base]
-desc: MediaTek MT7916 firmware
-version: 20211130
-
-[mediatek/mt7916_rom_patch.bin_base]
-desc: MediaTek MT7916 ROM patch
-version: 20230202144915a
-
-[mediatek/mt7916_wa.bin_base]
-desc: MediaTek MT7916 firmware
-version: 20230202143332
-
-[mediatek/mt7916_wm.bin_base]
-desc: MediaTek MT7916 firmware
-Version: 20230202145005
-
-[mediatek/mt7981_rom_patch.bin_base]
-desc: MediaTek MT7981 ROM patch
-version: 20221208201745a
-
-[mediatek/mt7981_wa.bin_base]
-desc: MediaTek MT7981 firmware
-version: 20221208202048
-
-[mediatek/mt7981_wm.bin_base]
-desc: MediaTek MT7981 firmware
-version: 20221208201806
-
-[mediatek/mt7981_wo.bin_base]
-desc: MediaTek MT7981 firmware
-version: 20221208202138
-
-[mediatek/mt7986_eeprom_mt7975_dual.bin_base]
-desc: MediaTek MT7986 firmware
-version: 20220208
-
-[mediatek/mt7986_eeprom_mt7976.bin_base]
-desc: MediaTek MT7986 firmware
-version: 20211105
-
-[mediatek/mt7986_eeprom_mt7976_dbdc.bin_base]
-desc: MediaTek MT7986 firmware
-version: 20220223
-
-[mediatek/mt7986_eeprom_mt7976_dual.bin_base]
-desc: MediaTek MT7986 firmware
-version: 20211115
-
-[mediatek/mt7986_rom_patch.bin_base]
-desc: MediaTek MT7986 ROM patch
-version: 20221012174648a
-
-[mediatek/mt7986_rom_patch_mt7975.bin_base]
-desc: MediaTek MT7986 ROM patch
-version: 20221012174743a
-
-[mediatek/mt7986_wa.bin_base]
-desc: MediaTek MT7986 firmware
-version: 20221012174937
-
-[mediatek/mt7986_wm.bin_base]
-desc: MediaTek MT7986 firmware
-version: 20221012174725
-
-[mediatek/mt7986_wm_mt7975.bin_base]
-desc: MediaTek MT7986 firmware
-version: 20221012174805
-
-[mediatek/mt7986_wo_0.bin_base]
-desc: MediaTek MT7986 firmware
-version: 20221012175005
-
-[mediatek/mt7986_wo_1.bin_base]
-desc: MediaTek MT7986 firmware
-version: 20221012175032
-
-[mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin_base]
-desc: MediaTek MT7922 hdr firmware
-version: 20230530123154a
-
-[mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin_base]
-desc: MediaTek MT7921 hdr firmware
-version: 20230526130917a
-
-[mediatek/WIFI_RAM_CODE_MT7922_1.bin_base]
-desc: MediaTek MT7922 firmware
-version: 20230530123236
-
-[mediatek/WIFI_RAM_CODE_MT7961_1.bin_base]
-desc: MediaTek MT7921 firmware
-version: 20230526130958
-
-[mediatek/mt8173/vpu_d.bin_base]
-desc: MediaTek MT8173 VPU_D firmware
-version: 1.1.7
-
-[mediatek/mt8173/vpu_p.bin_base]
-desc: MediaTek MT8173 VPU_P firmware
-version: 1.1.7
-
-[mediatek/mt8183/scp.img_base]
-desc: MediaTek MT8183 SCP firmware
-version: v2.0.13324
-
-[mediatek/mt8186/scp.img_base]
-desc: MediaTek MT8186 SCP firmware
-version: v0.0.9
-
-[mediatek/mt8192/scp.img_base]
-desc: MediaTek MT8192 SCP firmware
-version: 2.0.20536
-
-[mediatek/mt8195/scp.img_base]
-desc: MediaTek MT8195 SCP firmware
-version: 2.0.11966
-
-[mediatek/sof-tplg/sof-mt8186.tplg_base]
-desc: MediaTek SOF MT8186 tplg firmware
-version: v0.2.1
-
-[mediatek/sof-tplg/sof-mt8195-mt6359-rt1019-rt5682-dts.tplg_base]
-desc: MediaTek SOF MT8195 dts dplg firmware
-version: v0.4.1
-
-[mediatek/sof-tplg/sof-mt8195-mt6359-rt1019-rt5682.tplg_base]
-desc: MediaTek SOF MT8195 tplg firmware
-version: v0.4.1
-
-[mediatek/sof/sof-mt8186.ldc_base]
-desc: MediaTek SOF MT8186 ldc firmware
-version: v0.2.1
-
-[mediatek/sof/sof-mt8186.ri_base]
-desc: MediaTek SOF MT8186 ri firmware
-version: v0.2.1
-
-[mediatek/sof/sof-mt8195.ldc_base]
-desc: MediaTek SOF MT8195 ldc firmware
-version: v0.4.1
-
-[mediatek/sof/sof-mt8195.ri_base]
-desc: MediaTek SOF MT8195 ri firmware
-version: v0.4.1
+ mt7601u.bin
+ mt7650.bin
+ mt7662.bin
+ mt7662_rom_patch.bin
+ rt2561.bin
+ rt2561s.bin
+ rt2661.bin
+ rt2860.bin
+ rt2870.bin
+ rt3070.bin
+ rt3071.bin
+ rt3090.bin
+ rt3290.bin
+ rt73.bin