Use renamed MT7921/MT7922 options from linux-firmware upstream merge (#3106)

* ../../../buildroot 55120df0b7...512a487366 (3): > package/linux-firmware: add WiFi and BT firmware for MT7921 and MT7922 > package/dbus-broker: fix legal info > package/rtl8821cu: fix legal info
2025-12-24 12:28:43 +00:00 · 2024-01-25 09:43:07 +01:00
parent 4619dcbb16
commit aadb5a74b6
19 changed files with 37 additions and 37 deletions
--- a/2
+++ b/2
--- a/buildroot-external/configs/generic_aarch64_defconfig
+++ b/buildroot-external/configs/generic_aarch64_defconfig
@@ -39,8 +39,8 @@ BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS_ZSTD=y
 BR2_PACKAGE_LINUX_FIRMWARE_I915=y
 BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
--- a/buildroot-external/configs/generic_x86_64_defconfig
+++ b/buildroot-external/configs/generic_x86_64_defconfig
@@ -40,8 +40,8 @@ BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS_ZSTD=y
 BR2_PACKAGE_LINUX_FIRMWARE_AMDGPU=y
 BR2_PACKAGE_LINUX_FIRMWARE_I915=y
 BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
--- a/buildroot-external/configs/green_defconfig
+++ b/buildroot-external/configs/green_defconfig
@@ -46,8 +46,8 @@ BR2_PACKAGE_NFS_UTILS=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS_ZSTD=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
--- a/buildroot-external/configs/khadas_vim3_defconfig
+++ b/buildroot-external/configs/khadas_vim3_defconfig
@@ -41,8 +41,8 @@ BR2_PACKAGE_NFS_UTILS=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS_ZSTD=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
--- a/buildroot-external/configs/odroid_c2_defconfig
+++ b/buildroot-external/configs/odroid_c2_defconfig
@@ -41,8 +41,8 @@ BR2_PACKAGE_NFS_UTILS=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS_ZSTD=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
--- a/buildroot-external/configs/odroid_c4_defconfig
+++ b/buildroot-external/configs/odroid_c4_defconfig
@@ -39,8 +39,8 @@ BR2_PACKAGE_NFS_UTILS=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS_ZSTD=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
--- a/buildroot-external/configs/odroid_m1_defconfig
+++ b/buildroot-external/configs/odroid_m1_defconfig
@@ -41,8 +41,8 @@ BR2_PACKAGE_NFS_UTILS=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS_ZSTD=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
--- a/buildroot-external/configs/odroid_n2_defconfig
+++ b/buildroot-external/configs/odroid_n2_defconfig
@@ -41,8 +41,8 @@ BR2_PACKAGE_NFS_UTILS=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS_ZSTD=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
--- a/buildroot-external/configs/odroid_xu4_defconfig
+++ b/buildroot-external/configs/odroid_xu4_defconfig
@@ -41,8 +41,8 @@ BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS_ZSTD=y
 BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
--- a/buildroot-external/configs/ova_defconfig
+++ b/buildroot-external/configs/ova_defconfig
@@ -43,8 +43,8 @@ BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS_ZSTD=y
 BR2_PACKAGE_LINUX_FIRMWARE_I915=y
 BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
--- a/buildroot-external/configs/rpi2_defconfig
+++ b/buildroot-external/configs/rpi2_defconfig
@@ -41,8 +41,8 @@ BR2_PACKAGE_NFS_UTILS=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS_ZSTD=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
--- a/buildroot-external/configs/rpi3_64_defconfig
+++ b/buildroot-external/configs/rpi3_64_defconfig
@@ -43,8 +43,8 @@ BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS_ZSTD=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
--- a/buildroot-external/configs/rpi3_defconfig
+++ b/buildroot-external/configs/rpi3_defconfig
@@ -44,8 +44,8 @@ BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS_ZSTD=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
--- a/buildroot-external/configs/rpi4_64_defconfig
+++ b/buildroot-external/configs/rpi4_64_defconfig
@@ -44,8 +44,8 @@ BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS_ZSTD=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
--- a/buildroot-external/configs/rpi4_defconfig
+++ b/buildroot-external/configs/rpi4_defconfig
@@ -44,8 +44,8 @@ BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS_ZSTD=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
--- a/buildroot-external/configs/rpi5_64_defconfig
+++ b/buildroot-external/configs/rpi5_64_defconfig
@@ -46,8 +46,8 @@ BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS_ZSTD=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
--- a/buildroot-external/configs/tinker_defconfig
+++ b/buildroot-external/configs/tinker_defconfig
@@ -43,8 +43,8 @@ BR2_PACKAGE_NFS_UTILS=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS_ZSTD=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y
--- a/buildroot-external/configs/yellow_defconfig
+++ b/buildroot-external/configs/yellow_defconfig
@@ -45,8 +45,8 @@ BR2_PACKAGE_BRCMFMAC_SDIO_FIRMWARE_RPI_WIFI=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS=y
 BR2_PACKAGE_LINUX_FIRMWARE_COMPRESS_ZSTD=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7921_BT=y
-BR2_PACKAGE_LINUX_FIRMWARE_MT7922_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7921_BT=y
+BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7922_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX_BT=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX_BT=y