[continued from previous message]

lib/firmware/iwlwifi-cc-a0-72.ucode non-free-firmware/kernel/firmware-iwlwifi
-lib/firmware/iwlwifi-so-a0-gf-a0-71.ucode non-free-firmware/kernel/firmware-iwlwifi
lib/firmware/iwlwifi-so-a0-gf-a0-72.ucode non-free-firmware/kernel/firmware-iwlwifi
lib/firmware/iwlwifi-so-a0-gf-a0.pnvm non-free-firmware/kernel/firmware-iwlwifi
-lib/firmware/iwlwifi-so-a0-gf4-a0-71.ucode non-free-firmware/kernel/firmware-iwlwifi
lib/firmware/iwlwifi-so-a0-gf4-a0-72.ucode non-free-firmware/kernel/firmware-iwlwifi
lib/firmware/iwlwifi-so-a0-gf4-a0.pnvm non-free-firmware/kernel/firmware-iwlwifi
-lib/firmware/iwlwifi-so-a0-hr-b0-71.ucode non-free-firmware/kernel/firmware-iwlwifi
-lib/firmware/iwlwifi-so-a0-jf-b0-71.ucode non-free-firmware/kernel/firmware-iwlwifi
lib/firmware/iwlwifi-so-a0-jf-b0-72.ucode non-free-firmware/kernel/firmware-iwlwifi
lib/firmware/iwlwifi-ty-a0-gf-a0-59.ucode non-free-firmware/kernel/firmware-iwlwifi
-lib/firmware/iwlwifi-ty-a0-gf-a0-62.ucode non-free-firmware/kernel/firmware-iwlwifi
-lib/firmware/iwlwifi-ty-a0-gf-a0-63.ucode non-free-firmware/kernel/firmware-iwlwifi
lib/firmware/iwlwifi-ty-a0-gf-a0-66.ucode non-free-firmware/kernel/firmware-iwlwifi
-lib/firmware/iwlwifi-ty-a0-gf-a0-71.ucode non-free-firmware/kernel/firmware-iwlwifi
lib/firmware/iwlwifi-ty-a0-gf-a0-72.ucode non-free-firmware/kernel/firmware-iwlwifi
lib/firmware/iwlwifi-ty-a0-gf-a0.pnvm non-free-firmware/kernel/firmware-iwlwifi
lib/firmware/kaweth/new_code.bin non-free-firmware/kernel/firmware-misc-nonfree
@@ -2225,6 +2191,8 @@ lib/firmware/qcom/venus-5.4/venus.mdt non-free-firmware/kernel
lib/firmware/qcom/vpu-1.0/venus.mbn non-free-firmware/kernel/firmware-qcom-soc
lib/firmware/qcom/vpu-1.0/venus.mdt non-free-firmware/kernel/firmware-qcom-soc
lib/firmware/qcom/vpu-2.0/venus.mbn non-free-firmware/kernel/firmware-qcom-soc
+lib/firmware/qcom/yamato_pfp.fw non-free-firmware/kernel/firmware-qcom-soc
+lib/firmware/qcom/yamato_pm4.fw non-free-firmware/kernel/firmware-qcom-soc
lib/firmware/qed/qed_init_values_zipped-8.10.10.0.bin non-free-firmware/kernel/firmware-qlogic
lib/firmware/qed/qed_init_values_zipped-8.33.1.0.bin non-free-firmware/kernel/firmware-qlogic
lib/firmware/qed/qed_init_values_zipped-8.33.11.0.bin non-free-firmware/kernel/firmware-qlogic
@@ -2608,6 +2576,7 @@ lib/firmware/rtw88/rtw8822b_fw.bin non-free-firmware/kernel
lib/firmware/rtw88/rtw8822c_fw.bin non-free-firmware/kernel/firmware-realtek
lib/firmware/rtw88/rtw8822c_wow_fw.bin non-free-firmware/kernel/firmware-realtek
lib/firmware/rtw89/rtw8852a_fw.bin non-free-firmware/kernel/firmware-realtek
+lib/firmware/rtw89/rtw8852b_fw.bin non-free-firmware/kernel/firmware-realtek
lib/firmware/rtw89/rtw8852c_fw.bin non-free-firmware/kernel/firmware-realtek
lib/firmware/s2250.fw non-free-firmware/kernel/firmware-misc-nonfree
lib/firmware/s2250_loader.fw non-free-firmware/kernel/firmware-misc-nonfree
@@ -2671,3 +2640,13 @@ lib/firmware/vntwusb.fw non-free-firmware/kernel
lib/firmware/wfx/wfm_wf200_C0.sec non-free-firmware/kernel/firmware-misc-nonfree
lib/firmware/wil6210.brd non-free-firmware/kernel/firmware-atheros
lib/firmware/wil6210.fw non-free-firmware/kernel/firmware-atheros
+lib/firmware/zd1211/zd1211_ub non-free-firmware/kernel/firmware-zd1211
+lib/firmware/zd1211/zd1211_uph non-free-firmware/kernel/firmware-zd1211
+lib/firmware/zd1211/zd1211_uphm non-free-firmware/kernel/firmware-zd1211
+lib/firmware/zd1211/zd1211_uphr non-free-firmware/kernel/firmware-zd1211
+lib/firmware/zd1211/zd1211_ur non-free-firmware/kernel/firmware-zd1211
+lib/firmware/zd1211/zd1211b_ub non-free-firmware/kernel/firmware-zd1211
+lib/firmware/zd1211/zd1211b_uph non-free-firmware/kernel/firmware-zd1211
+lib/firmware/zd1211/zd1211b_uphm non-free-firmware/kernel/firmware-zd1211
+lib/firmware/zd1211/zd1211b_uphr non-free-firmware/kernel/firmware-zd1211
+lib/firmware/zd1211/zd1211b_ur non-free-firmware/kernel/firmware-zd1211
diff --git a/generated/Fw-Contents-all-sid-main b/generated/Fw-Contents-all-sid-main
index 0b34313..38c54ca 100644
--- a/generated/Fw-Contents-all-sid-main
+++ b/generated/Fw-Contents-all-sid-main
@@ -1,5 +1,5 @@
-lib/firmware/ath9k_htc/htc_7010-1.dev.0.fw misc/firmware-ath9k-htc
-lib/firmware/ath9k_htc/htc_9271-1.dev.0.fw misc/firmware-ath9k-htc
+lib/firmware/ath9k_htc/htc_7010-1.4.0.fw misc/firmware-ath9k-htc
+lib/firmware/ath9k_htc/htc_9271-1.4.0.fw misc/firmware-ath9k-htc
lib/firmware/av7110/bootcode.bin kernel/firmware-linux-free
lib/firmware/carl9170-1.fw kernel/firmware-linux-free
lib/firmware/cis/3CCFEM556.cis kernel/firmware-linux-free
diff --git a/generated/Fw-Contents-all-sid-non-free b/generated/Fw-Contents-all-sid-non-free
deleted file mode 100644
index 00d7a66..0000000
--- a/generated/Fw-Contents-all-sid-non-free
+++ /dev/null
@@ -1,10 +0,0 @@
-lib/firmware/zd1211/zd1211_ub non-free/kernel/firmware-zd1211
-lib/firmware/zd1211/zd1211